diff --git a/ckanext/kepa/assets/css/kepa.css b/ckanext/kepa/assets/css/kepa.css
index 1d0ba30..b181c92 100644
--- a/ckanext/kepa/assets/css/kepa.css
+++ b/ckanext/kepa/assets/css/kepa.css
@@ -264,9 +264,9 @@
   width: 60px;
 }
 
-.account .list-unstyled {
+.account-masthead .container {
   display: flex;
-  justify-content: center;
+  justify-content: end;
   align-items: center;
 }
 
diff --git a/ckanext/kepa/assets/css/kepa.css.map b/ckanext/kepa/assets/css/kepa.css.map
index db66abd..bee6cd5 100644
--- a/ckanext/kepa/assets/css/kepa.css.map
+++ b/ckanext/kepa/assets/css/kepa.css.map
@@ -1 +1 @@
-{"version":3,"sourceRoot":"","sources":["../scss/kepa.scss","../scss/_mixins.scss","../scss/_variables.scss"],"names":[],"mappings":"AAGA;ECFI;EACA;EACA;;;ADIJ;ECKI;EACA;;;ADFJ;EACI;EACA,kBEbY;;;AFgBhB;EACI,OEZI;EFaJ,aEXG;EFYH,WEXQ;;;AFcZ;EACI;EACA;;;AAGJ;EACI;EACA;;;AAGJ;EACI;EACA;EACA;;;AAGJ;EACI;;;AAEJ;EACI;;;AAGJ;EACI;EACA;;;AAGJ;EACI;EACA;ECxCA;EACA;EDyCA;EC/CA;EACA;;;ADkDJ;EACI;;;AAGJ;EACI;IACI;;;AAIR;EACI,OEhEI;EFiEJ,WE7DO;EF8DP;;;AAGJ;ECzEI;EACA;EACA;EDyEA;EACA;;;AAGJ;EC/EI;EACA;EACA;;;ADiFJ;EACI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGJ;EACI;EACA;;;AAGJ;EACI,OEjGI;;;AFoGR;EACI;EACA;EACA;EACA;;;AAGJ;EACI;EACA;EACA;EACA;;;AAGJ;EACI;IACI;;;AAIR;EACI,kBEzHI;EF0HJ;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGJ;EACI;EACA;EACA;;;AAGJ;EACI;EACA;;;AAGJ;EACI;EC9IA;EACA;ED+IA,kBEtJc;;;AFyJlB;EACI,OEtJI;EFuJJ;EChJA;EACA;EDiJA;EACA;;;AAGJ;EACI,WEzJQ;EF0JR;;;AAGJ;EACI;EACA;EACA;;;AAGJ;EACI;IACI;IACA;;;EAGJ;IACI;;;AAIR;EACI;EACA;;;AAGJ;EACI;;;AAGJ;EACI,OE7LI;EF8LJ;;;AAGJ;EACI;;;AAGJ;EACI;EACA;EACA;EACA;EACA;EACA,OE3MI;EF4MJ,aE1MG;EF2MH;;;AAGJ;EACI;IACI;;;AAIR;EACI;EACA;;;AAGJ;EACI;;;AAGJ;EACI,kBEpOc;EFqOd;EACA;;;AAGJ;EACI,OE1Oc;;;AF6OlB;EACI;EACA,kBEhPY;;;AFmPhB;EACI;;;AAGJ;EACI;EACA;;;AAGJ;EACI;EACA;;;AAGJ;EACI;;;AAGJ;ECpQI;EACA;EACA","file":"kepa.css"}
\ No newline at end of file
+{"version":3,"sourceRoot":"","sources":["../scss/kepa.scss","../scss/_mixins.scss","../scss/_variables.scss"],"names":[],"mappings":"AAGA;ECFI;EACA;EACA;;;ADIJ;ECKI;EACA;;;ADFJ;EACI;EACA,kBEbY;;;AFgBhB;EACI,OEZI;EFaJ,aEXG;EFYH,WEXQ;;;AFcZ;EACI;EACA;;;AAGJ;EACI;EACA;;;AAGJ;EACI;EACA;EACA;;;AAGJ;EACI;;;AAEJ;EACI;;;AAGJ;EACI;EACA;;;AAGJ;EACI;EACA;ECxCA;EACA;EDyCA;EC/CA;EACA;;;ADkDJ;EACI;;;AAGJ;EACI;IACI;;;AAIR;EACI,OEhEI;EFiEJ,WE7DO;EF8DP;;;AAGJ;ECzEI;EACA;EACA;EDyEA;EACA;;;AAGJ;EC/EI;EACA;EACA;;;ADiFJ;EACI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGJ;EACI;EACA;;;AAGJ;EACI,OEjGI;;;AFoGR;EACI;EACA;EACA;EACA;;;AAGJ;EACI;EACA;EACA;EACA;;;AAGJ;EACI;IACI;;;AAIR;EACI,kBEzHI;EF0HJ;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGJ;EACI;EACA;EACA;;;AAGJ;EACI;EACA;;;AAGJ;EACI;EC9IA;EACA;ED+IA,kBEtJc;;;AFyJlB;EACI,OEtJI;EFuJJ;EChJA;EACA;EDiJA;EACA;;;AAGJ;EACI,WEzJQ;EF0JR;;;AAGJ;EACI;EACA;EACA;;;AAGJ;EACI;IACI;IACA;;;EAGJ;IACI;;;AAIR;EACI;EACA;;;AAGJ;EACI;;;AAGJ;EACI,OE7LI;EF8LJ;;;AAGJ;EACI;;;AAGJ;EACI;EACA;EACA;EACA;EACA;EACA,OE3MI;EF4MJ,aE1MG;EF2MH;;;AAGJ;EACI;IACI;;;AAIR;EACI;EACA;;;AAGJ;EACI;;;AAGJ;EACI,kBEpOc;EFqOd;EACA;;;AAGJ;EACI,OE1Oc;;;AF6OlB;EACI;EACA,kBEhPY;;;AFmPhB;EACI;;;AAGJ;EACI;EACA;;;AAGJ;EACI;EACA;;;AAGJ;EACI;;;AAGJ;EACI;EACA;EACA","file":"kepa.css"}
\ No newline at end of file
diff --git a/ckanext/kepa/assets/scss/kepa.scss b/ckanext/kepa/assets/scss/kepa.scss
index d1327f8..f16bb5c 100644
--- a/ckanext/kepa/assets/scss/kepa.scss
+++ b/ckanext/kepa/assets/scss/kepa.scss
@@ -78,7 +78,7 @@
     width: 80%;
 }
 
-.hero .container{
+.hero .container {
     @include center-flex;
 }
 
@@ -259,6 +259,8 @@
     width: 60px;
 }
 
-.account .list-unstyled {
-    @include center-flex;
+.account-masthead .container {
+    display: flex;
+    justify-content: end;
+    align-items: center;
 }
diff --git a/ckanext/kepa/templates/header.html b/ckanext/kepa/templates/header.html
index 742fb10..f712d28 100644
--- a/ckanext/kepa/templates/header.html
+++ b/ckanext/kepa/templates/header.html
@@ -3,12 +3,12 @@
 {% block header_wrapper %} {% block header_account %}
 <div class="account-masthead">
   <div class="container">
+    <div class="language">
+      {% snippet "snippets/language_selector.html" %}
+    </div>
     {% block header_account_container_content %} {% if c.userobj %}
     <div class="account avatar authed" data-module="me" data-me="{{ c.userobj.id }}">
       <ul class="list-unstyled">
-        <div class="language">
-          {% snippet "snippets/language_selector.html" %}
-        </div>
         {% block header_account_logged %} {% if c.userobj.sysadmin %}
         <li>
           <a href="{{ h.url_for('admin.index') }}" title="{{ _('Sysadmin settings') }}">
@@ -105,7 +105,8 @@ <h2>{{ g.site_description }}</h2>
           {% set group_type = h.default_group_type('group') %}
 
           {{ h.build_nav_main(
-          (dataset_type ~ '.search', h.humanize_entity_type('package', dataset_type, 'main nav') or _('datasets').upper(),
+          (dataset_type ~ '.search', h.humanize_entity_type('package', dataset_type, 'main nav') or
+          _('datasets').upper(),
           ["dataset", "resource"]),
           (org_type ~ '.index',
           h.humanize_entity_type('organization', org_type, 'main nav') or _('organizations').upper(), ['organization']),