diff --git a/data/ui/dialogs/main.ui b/data/ui/dialogs/main.ui
index cca278f..ca31b42 100644
--- a/data/ui/dialogs/main.ui
+++ b/data/ui/dialogs/main.ui
@@ -56,6 +56,7 @@
     </child>
     <child type="titlebar">
       <object class="GtkHeaderBar" id="header">
+        <property name="height_request">48</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="show_close_button">True</property>
@@ -65,7 +66,7 @@
             <property name="policy">auto</property>
           </object>
           <packing>
-            <property name="position">1</property>
+            <property name="position">2</property>
           </packing>
         </child>
         <child>
@@ -73,11 +74,48 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <child>
-              <object class="TootleWidgetsAccountsButton" id="accounts_button">
+              <object class="GtkRevealer" id="view_navigation">
                 <property name="visible">True</property>
-                <style>
-                  <class name="image-button"/>
-                </style>
+                <property name="can_focus">False</property>
+                <property name="transition_type">slide-right</property>
+                <property name="transition_duration">200</property>
+                <child>
+                  <object class="GtkBox">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="margin_end">6</property>
+                    <property name="spacing">6</property>
+                    <child>
+                      <object class="GtkButton" id="back_button">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">True</property>
+                        <child>
+                          <object class="GtkImage">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="icon_name">go-previous-symbolic</property>
+                          </object>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkSeparator">
+                        <property name="can_focus">False</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                  </object>
+                </child>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -86,38 +124,60 @@
               </packing>
             </child>
             <child>
-              <object class="GtkButton" id="compose_button">
+              <object class="GtkBox" id="account_actions">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
+                <property name="can_focus">False</property>
                 <child>
-                  <object class="GtkImage">
+                  <object class="TootleWidgetsAccountsButton" id="accounts_button">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="icon_name">document-edit-symbolic</property>
+                    <style>
+                      <class name="image-button"/>
+                    </style>
                   </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
                 </child>
+                <child>
+                  <object class="GtkButton" id="compose_button">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">True</property>
+                    <child>
+                      <object class="GtkImage">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="icon_name">document-edit-symbolic</property>
+                      </object>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+                <style>
+                  <class name="linked"/>
+                  <class name="horizontal"/>
+                </style>
               </object>
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">True</property>
-                <property name="position">1</property>
+                <property name="position">2</property>
               </packing>
             </child>
-            <style>
-              <class name="linked"/>
-              <class name="horizontal"/>
-            </style>
           </object>
-          <packing>
-            <property name="position">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkRevealer" id="view_controls">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="transition_type">slide-left</property>
+            <property name="valign">center</property>
+            <property name="transition_type">crossfade</property>
             <property name="transition_duration">200</property>
             <child>
               <placeholder/>
@@ -128,54 +188,6 @@
             <property name="position">2</property>
           </packing>
         </child>
-        <child>
-          <object class="GtkRevealer" id="view_navigation">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="transition_type">slide-right</property>
-            <property name="transition_duration">200</property>
-            <child>
-              <object class="GtkBox">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="spacing">6</property>
-                <child>
-                  <object class="GtkSeparator">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkButton" id="back_button">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">True</property>
-                    <child>
-                      <object class="GtkImage">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="icon_name">go-previous-symbolic</property>
-                      </object>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-              </object>
-            </child>
-          </object>
-          <packing>
-            <property name="position">2</property>
-          </packing>
-        </child>
       </object>
     </child>
   </template>
diff --git a/data/ui/views/base.ui b/data/ui/views/base.ui
index c026a99..74bd0ad 100644
--- a/data/ui/views/base.ui
+++ b/data/ui/views/base.ui
@@ -26,8 +26,8 @@
                   <object class="HdyClamp" id="clamp">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="maximum_size">628</property>
-                    <property name="tightening-threshold">628</property>
+                    <property name="maximum_size">632</property>
+                    <property name="tightening-threshold">632</property>
                     <child>
                       <object class="GtkBox" id="column_view">
                         <property name="visible">True</property>
diff --git a/data/ui/widgets/accounts_button.ui b/data/ui/widgets/accounts_button.ui
index 675c33a..0e48682 100644
--- a/data/ui/widgets/accounts_button.ui
+++ b/data/ui/widgets/accounts_button.ui
@@ -24,7 +24,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="text" translatable="yes"> </property>
+                <property name="text" translatable="no"> </property>
                 <property name="use_markup">True</property>
                 <property name="menu_name">accounts</property>
               </object>
@@ -314,7 +314,8 @@
         <child>
           <object class="TootleWidgetsAvatar" id="avatar">
             <property name="visible">True</property>
-            <property name="size">25</property>
+            <property name="size">24</property>
+            <property name="valign">center</property>
           </object>
           <packing>
             <property name="pass_through">True</property>
diff --git a/data/ui/widgets/profile_field_row.ui b/data/ui/widgets/profile_field_row.ui
index 5ea6787..829e96e 100644
--- a/data/ui/widgets/profile_field_row.ui
+++ b/data/ui/widgets/profile_field_row.ui
@@ -25,6 +25,7 @@
             <property name="wrap">True</property>
             <property name="wrap_mode">word-char</property>
             <property name="xalign">1</property>
+            <property name="yalign">0</property>
             <property name="max-width-chars">1</property>
             <attributes>
               <attribute name="weight" value="bold"/>
diff --git a/src/Views/Profile.vala b/src/Views/Profile.vala
index f63a830..e91a925 100644
--- a/src/Views/Profile.vala
+++ b/src/Views/Profile.vala
@@ -91,6 +91,7 @@ public class Tootle.Views.Profile : Views.Timeline {
 
 	public override void on_shown () {
 		window.header.custom_title = filter;
+		filter.valign = Align.FILL;
 		window.set_header_controls (rs_button);
 	}
 	public override void on_hidden () {