diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 2c7c9995c8..258b16b96a 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -17,9 +17,9 @@
 
       <div id="user-navigation">
         <ul class="wat-cf">
-          <li><a href="#"><%= t("web-app-theme.profile", :default => "Profile") %></a></li>
-          <li><a href="#"><%= t("web-app-theme.settings", :default => "Settings") %></a></li>
-          <li><a href="/logout" class="logout"><%= t("web-app-theme.logout", :default => "Logout") %></a></li>
+          <!--<li><a href="#"><%= t("web-app-theme.profile", :default => "Profile") %></a></li>
+          <li><a href="#"><%= t("web-app-theme.settings", :default => "Settings") %></a></li>-->
+          <li><%= link_to t("web-app-theme.logout", :default => "Logout"), destroy_user_session_path, :method => :delete, :class=>'logout' %></li>
         </ul>
       </div>
       <div id="main-navigation">
diff --git a/config/routes.rb b/config/routes.rb
index 8fa6b32fb1..4dad9abec0 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -7,7 +7,7 @@ HabitTracker::Application.routes.draw do
     end
   end
 
-  devise_for :users
+  devise_for :users, :path => '', :path_names => { :sign_in => "login", :sign_out => "logout", :sign_up => "register" }
   resources :tokens,:only => [:create, :destroy]
 
   # The priority is based upon order of creation: