diff --git a/blocks/ORB/Userbar.pm b/blocks/ORB/Userbar.pm
index 7032fec..5c16ed9 100644
--- a/blocks/ORB/Userbar.pm
+++ b/blocks/ORB/Userbar.pm
@@ -23,7 +23,8 @@ package ORB::Userbar;
 
 use strict;
 use parent qw(ORB);
-use v5.12;
+use experimental qw(smartmatch);
+use v5.14;
 
 
 # ==============================================================================
@@ -46,42 +47,57 @@ sub block_display {
 
     $self -> clear_error();
 
-    my $loginurl = $self -> build_url(block => "login",
-                                      fullurl  => 1,
-                                      pathinfo => [],
-                                      params   => {},
-                                      forcessl => 1);
+    my $urls = { "signin"  => $self -> build_url(block => "login",
+                                                fullurl  => 1,
+                                                pathinfo => [],
+                                                params   => {},
+                                                forcessl => 1),
+                 "signout" => $self -> build_url(block => "login",
+                                                fullurl  => 1,
+                                                pathinfo => [ "logout" ],
+                                                params   => {},
+                                                forcessl => 1),
+                 "signup"  => $self -> build_url(block => "login",
+                                                 fullurl  => 1,
+                                                 pathinfo => [ "signup" ],
+                                                 params   => {},
+                                                 forcessl => 1),
+                 "front"   => $self -> build_url(block    => $self -> {"settings"} -> {"config"} -> {"default_block"},
+                                                 fullurl  => 1,
+                                                 pathinfo => [],
+                                                 params   => {})
+    };
 
-    my $fronturl = $self -> build_url(block    => $self -> {"settings"} -> {"config"} -> {"default_block"},
-                                      fullurl  => 1,
-                                      pathinfo => [],
-                                      params   => {});
-
-    # Initialise fragments to sane "logged out" defaults.
-    my ($userprofile) =
-        ($self -> {"template"} -> load_template("userbar/profile_loggedout_http".($ENV{"HTTPS"} eq "on" ? "s" : "").".tem", {"%(url-login)s" => $loginurl}),
-        );
+    my $userprofile;
 
     # Is the user logged in?
     if(!$self -> {"session"} -> anonymous_session()) {
         my $user = $self -> {"session"} -> get_user_byid()
             or return $self -> self_error("Unable to obtain user data for logged in user. This should not happen!");
 
-        $import  = $self -> {"template"} -> load_template("userbar/import_enabled.tem"  , {"%(url-import)s" => $self -> build_url(block => "import", pathinfo => [])})
-            if($self -> check_permission("import") && $current ne "import");
-
         # User is logged in, so actually reflect their current options and state
-        $userprofile = $self -> {"template"} -> load_template("userbar/profile_loggedin.tem", {"%(realname)s"    => $user -> {"fullname"},
-                                                                                               "%(username)s"    => $user -> {"username"},
-                                                                                               "%(gravhash)s"    => $user -> {"gravatar_hash"},
-                                                                                               "%(url-logout)s"  => $self -> build_url(block => "login"  , pathinfo => ["logout"])});
-    } # if(!$self -> {"session"} -> anonymous_session())
+        $userprofile = $self -> {"template"} -> load_template("userbar/profile_signedin.tem",
+                                                              { "%(realname)s"    => $user -> {"fullname"},
+                                                                "%(username)s"    => $user -> {"username"},
+                                                                "%(gravhash)s"    => $user -> {"gravatar_hash"},
+                                                                "%(url-signout)s" => $urls -> {"signout"},
+                                                              });
 
-    return $self -> {"template"} -> load_template("userbar/userbar.tem", {"%(pagename)s"  => $title,
-                                                                          "%(front_url)s" => $fronturl,
-                                                                          "%(import)s"    => $import,
-                                                                          "%(doclink)s"   => $docs,
-                                                                          "%(profile)s"   => $userprofile});
+    } else {
+        my $signup = $self -> {"template"} -> load_template("userbar/profile_signup.tem")
+            if($self -> {"settings"} -> {"config"} -> {"Login:allow_self_register"});
+
+        $userprofile = $self -> {"template"} -> load_template("userbar/profile_signedout.tem",
+                                                              { "%(signup)s"    => $signup,
+                                                                "%(url-signin)s" => $urls -> {"signin"},
+                                                                "%(url-signup)s" => $urls -> {"signup"},
+                                                              });
+    }
+
+    return $self -> {"template"} -> load_template("userbar/userbar.tem",
+                                                  { "%(pagename)s"  => $title,
+                                                    "%(url-front)s" => $urls -> {"front"},
+                                                    "%(profile)s"   => $userprofile});
 }
 
 
diff --git a/templates/default/userbar/profile_signedout.tem b/templates/default/userbar/profile_signedout.tem
new file mode 100644
index 0000000..56d513e
--- /dev/null
+++ b/templates/default/userbar/profile_signedout.tem
@@ -0,0 +1,4 @@
+                        <ul class="menu">
+%(signup)s
+                            <li><a class="button" href="%(url-signin)s">Sign in</a></li>
+                        </ul>
diff --git a/templates/default/userbar/profile_signup.tem b/templates/default/userbar/profile_signup.tem
new file mode 100644
index 0000000..f7476d7
--- /dev/null
+++ b/templates/default/userbar/profile_signup.tem
@@ -0,0 +1 @@
+                            <li><a class="button" href="%(url-signup)s">Sign up</a></li>
diff --git a/templates/default/userbar/userbar.tem b/templates/default/userbar/userbar.tem
index fc7ddac..4811213 100755
--- a/templates/default/userbar/userbar.tem
+++ b/templates/default/userbar/userbar.tem
@@ -1,9 +1,12 @@
-        <div class="top-bar">
-            <div class="top-bar-title"><span class="title">%(title)s</span></div>
-            <div class="top-bar-right">
-                <ul class="menu">
-                    <li><a class="button success">Sign up</a></li>
-                    <li><a class="button">Sign in</a></li>
-                </ul>
-            </div>
-        </div>
\ No newline at end of file
+                <div class="top-bar">
+                    <div class="top-bar-left">
+                        <ul class="menu">
+                            <li class="hide-for-medium"><button id="menubtn" class="menu-icon dark" type="button" data-open="offCanvas"></button></li>
+                            <li><a href="%(url-front)s"><i class="fa fa-book fa-lg" style="color: #000"></i></a></li>
+                            <li><input type="search" placeholder="Search"></li>
+                        </ul>
+                    </div>
+                    <div class="top-bar-right show-for-medium">
+%(profile)s
+                    </div>
+                </div>
\ No newline at end of file