diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
index 29b3bd4..b199dc2 100644
--- a/app/assets/stylesheets/application.css
+++ b/app/assets/stylesheets/application.css
@@ -34,6 +34,7 @@ body {
   float: right;
   font-size: 0.8em;
   font-weight: bold;
+  margin-left: 1em;
   padding: 0.6em;
 }
 .application-menu a:hover {
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 61214f3..d49bbe4 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -16,6 +16,8 @@
                        data: { turbo_method: :delete } do %>
         <%= link_to t(:sign_in), new_user_session_path %>
       <% end %>
+
+      <%= link_to_unless(user_signed_in?, t(:register), new_user_registration_path) { } %>
     </div>
 
     <div class="flashes">
diff --git a/app/views/users/shared/_links.html.erb b/app/views/users/shared/_links.html.erb
index 7a75304..dbb59c3 100644
--- a/app/views/users/shared/_links.html.erb
+++ b/app/views/users/shared/_links.html.erb
@@ -2,10 +2,6 @@
   <%= link_to "Log in", new_session_path(resource_name) %><br />
 <% end %>
 
-<%- if devise_mapping.registerable? && controller_name != 'registrations' %>
-  <%= link_to "Sign up", new_registration_path(resource_name) %><br />
-<% end %>
-
 <%- if devise_mapping.recoverable? && controller_name != 'passwords' && controller_name != 'registrations' %>
   <%= link_to "Forgot your password?", new_password_path(resource_name) %><br />
 <% end %>
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
index 46edb3a..c7f707c 100644
--- a/config/initializers/devise.rb
+++ b/config/initializers/devise.rb
@@ -244,7 +244,7 @@ Devise.setup do |config|
   # Turn scoped views on. Before rendering "sessions/new", it will first check for
   # "users/sessions/new". It's turned off by default because it's slower if you
   # are using only default views.
-  config.scoped_views = false
+  config.scoped_views = true
 
   # Configure the default scope given to Warden. By default it's the first
   # devise role declared in your routes (usually :user).