diff --git a/resources/manager_window.ui b/resources/manager_window.ui
index fbbd16e..d3c61ad 100644
--- a/resources/manager_window.ui
+++ b/resources/manager_window.ui
@@ -43,7 +43,6 @@
   <template class="PamacManagerWindow" parent="GtkApplicationWindow">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="border_width">3</property>
     <property name="title" translatable="yes">Package Manager</property>
     <property name="window_position">center</property>
     <property name="default_height">600</property>
@@ -179,7 +178,6 @@
                   <object class="GtkBox" id="box3">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="border_width">6</property>
                     <property name="orientation">vertical</property>
                     <property name="spacing">6</property>
                     <child>
@@ -200,19 +198,19 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkBox" id="box4">
+                      <object class="GtkBox" id="search_aur_box">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="spacing">6</property>
+                        <property name="spacing">12</property>
+                        <property name="homogeneous">True</property>
                         <child>
                           <object class="GtkLabel" id="search_aur_label">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="halign">start</property>
                             <property name="label" translatable="yes">Search in AUR</property>
                           </object>
                           <packing>
-                            <property name="expand">True</property>
+                            <property name="expand">False</property>
                             <property name="fill">True</property>
                             <property name="position">0</property>
                           </packing>
@@ -222,10 +220,10 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="tooltip_text" translatable="yes">Search in AUR</property>
-                            <property name="halign">end</property>
+                            <property name="halign">start</property>
                           </object>
                           <packing>
-                            <property name="expand">True</property>
+                            <property name="expand">False</property>
                             <property name="fill">True</property>
                             <property name="position">1</property>
                           </packing>
@@ -463,8 +461,8 @@
                         <child>
                           <object class="GtkTreeViewColumn" id="state_column">
                             <property name="resizable">True</property>
-                            <property name="min_width">20</property>
                             <property name="fixed_width">40</property>
+                            <property name="min_width">20</property>
                             <property name="title" translatable="yes">State</property>
                             <property name="clickable">True</property>
                             <signal name="clicked" handler="on_state_column_clicked" swapped="no"/>
@@ -479,8 +477,8 @@
                         <child>
                           <object class="GtkTreeViewColumn" id="name_column">
                             <property name="resizable">True</property>
-                            <property name="min_width">20</property>
                             <property name="fixed_width">150</property>
+                            <property name="min_width">20</property>
                             <property name="title" translatable="yes">Name</property>
                             <property name="expand">True</property>
                             <property name="clickable">True</property>
@@ -496,8 +494,8 @@
                         <child>
                           <object class="GtkTreeViewColumn" id="version_column">
                             <property name="resizable">True</property>
-                            <property name="min_width">20</property>
                             <property name="fixed_width">90</property>
+                            <property name="min_width">20</property>
                             <property name="title" translatable="yes">Version</property>
                             <property name="clickable">True</property>
                             <signal name="clicked" handler="on_version_column_clicked" swapped="no"/>
@@ -512,8 +510,8 @@
                         <child>
                           <object class="GtkTreeViewColumn" id="repo_column">
                             <property name="resizable">True</property>
-                            <property name="min_width">20</property>
                             <property name="fixed_width">90</property>
+                            <property name="min_width">20</property>
                             <property name="title" translatable="yes">Repository</property>
                             <property name="clickable">True</property>
                             <signal name="clicked" handler="on_repo_column_clicked" swapped="no"/>
@@ -528,8 +526,8 @@
                         <child>
                           <object class="GtkTreeViewColumn" id="size_column">
                             <property name="resizable">True</property>
-                            <property name="min_width">20</property>
                             <property name="fixed_width">90</property>
+                            <property name="min_width">20</property>
                             <property name="title" translatable="yes">Size</property>
                             <property name="clickable">True</property>
                             <signal name="clicked" handler="on_size_column_clicked" swapped="no"/>
@@ -576,7 +574,10 @@
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="halign">start</property>
-                                    <property name="margin">6</property>
+                                    <property name="margin_start">6</property>
+                                    <property name="margin_end">6</property>
+                                    <property name="margin_top">6</property>
+                                    <property name="margin_bottom">6</property>
                                     <property name="selectable">True</property>
                                   </object>
                                   <packing>
@@ -590,7 +591,10 @@
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="halign">start</property>
-                                    <property name="margin">6</property>
+                                    <property name="margin_start">6</property>
+                                    <property name="margin_end">6</property>
+                                    <property name="margin_top">6</property>
+                                    <property name="margin_bottom">6</property>
                                     <property name="selectable">True</property>
                                   </object>
                                   <packing>
@@ -605,7 +609,10 @@
                                     <property name="can_focus">True</property>
                                     <property name="has_focus">True</property>
                                     <property name="halign">start</property>
-                                    <property name="margin">6</property>
+                                    <property name="margin_start">6</property>
+                                    <property name="margin_end">6</property>
+                                    <property name="margin_top">6</property>
+                                    <property name="margin_bottom">6</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
@@ -618,7 +625,10 @@
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="halign">start</property>
-                                    <property name="margin">6</property>
+                                    <property name="margin_start">6</property>
+                                    <property name="margin_end">6</property>
+                                    <property name="margin_top">6</property>
+                                    <property name="margin_bottom">6</property>
                                     <property name="selectable">True</property>
                                   </object>
                                   <packing>