diff --git a/data/resources/ui/logged_in/engines/engine_detail.ui b/data/resources/ui/logged_in/engines/engine_detail.ui
index b37b8e6..8da305d 100644
--- a/data/resources/ui/logged_in/engines/engine_detail.ui
+++ b/data/resources/ui/logged_in/engines/engine_detail.ui
@@ -2,49 +2,50 @@
 <interface>
     <template class="EpicEngineDetails" parent="GtkBox">
         <property name="orientation">vertical</property>
-            <child>
-                <object class="GtkBox">
-                    <property name="hexpand">true</property>
-                    <property name="halign">fill</property>
-                    <property name="margin-top">12</property>
-                    <property name="margin-bottom">12</property>
-                    <property name="margin-start">12</property>
-                    <property name="margin-end">12</property>
-                    <child>
-                        <object class="GtkButton" id="launch_button">
-                            <property name="name">engine_launch_button</property>
-                            <property name="action-name">engine_details.launch</property>
-                            <property name="halign">end</property>
-                            <property name="valign">center</property>
-                            <property name="css-classes">suggested-action
-pill</property>
-                            <child>
-                                <object class="AdwButtonContent">
-                                    <property name="icon-name">media-playback-start-symbolic</property>
-                                    <property name="label" translatable="yes">Launch</property>
-                                </object>
-                            </child>
-                        </object>
-                    </child>
-                </object>
-            </child>
+        <child>
+            <object class="GtkSeparator"/>
+        </child>
         <child>
             <object class="GtkRevealer" id="details_revealer">
                 <property name="reveal-child">true</property>
                 <property name="vexpand">True</property>
                 <child>
-                    <object class="GtkScrolledWindow">
+                    <object class="AdwPreferencesPage">
                         <child>
-                            <object class="GtkBox">
-                                <property name="vexpand">True</property>
-                                <property name="orientation">vertical</property>
+                            <object class="AdwPreferencesGroup">
+                                <child>
+                                    <object class="GtkButton" id="launch_button">
+                                    <property name="halign">start</property>
+                                    <property name="name">engine_launch_button</property>
+                                    <property name="action-name">engine_details.launch</property>
+                                    <property name="css-classes">suggested-action
+pill</property>
+                                    <child>
+                                        <object class="AdwButtonContent">
+                                            <property name="icon-name">media-playback-start-symbolic</property>
+                                            <property name="label" translatable="yes">Launch</property>
+                                        </object>
+                                    </child>
+                                </object>
+                            </child>
+                            </object>
+                        </child>
+                        <child>
+                            <object class="AdwPreferencesGroup">
+                                <property name="title">General</property>
                                 <child>
                                     <object class="GtkListBox" id="details">
                                         <property name="selection-mode">GTK_SELECTION_NONE</property>
+                                        <property name="css-classes">boxed-list</property>
                                     </object>
                                 </child>
+                            </object>
+                        </child>
+                        <child>
+                            <object class="AdwPreferencesGroup">
+                                <property name="title">Details</property>
                                 <child>
-                                    <object class="AdwExpanderRow" id="logs_row">
+                                  <object class="AdwExpanderRow" id="logs_row">
                                         <property name="title" translatable="yes">Logs</property>
                                         <property name="expanded">0</property>
                                         <child>
diff --git a/data/resources/ui/logged_in/engines/engines_side.ui b/data/resources/ui/logged_in/engines/engines_side.ui
index 8a179a7..741e53e 100644
--- a/data/resources/ui/logged_in/engines/engines_side.ui
+++ b/data/resources/ui/logged_in/engines/engines_side.ui
@@ -15,12 +15,13 @@
                 <child>
                     <object class="GtkBox">
                         <property name="orientation">vertical</property>
+                        <property name="css-classes">background</property>
                         <child>
                             <object class="GtkBox">
                                 <property name="margin-top">12</property>
                                 <property name="margin-bottom">12</property>
                                 <property name="margin-start">12</property>
-                                <property name="margin-end">12</property>
+                                <property name="margin-end">96</property>
                                 <property name="spacing">12</property>
                                 <child>
                                     <object class="GtkButton">
@@ -34,11 +35,12 @@ pill</property>
                                 </child>
                                 <child>
                                     <object class="GtkLabel" id="title">
+                                        <property name="hexpand">true</property>
+                                        <property name="halign">center</property>
                                         <property name="label" bind-source="EpicEnginesSide"
                                                   bind-property="title"
                                                   bind-flags="sync-create"/>
                                         <property name="ellipsize">middle</property>
-                                        <property name="halign">center</property>
                                         <property name="use-markup">true</property>
                                         <property name="css-classes">title-1</property>
                                     </object>
diff --git a/data/resources/ui/logged_in/engines/epic_download.ui b/data/resources/ui/logged_in/engines/epic_download.ui
index feef1f1..62d716d 100644
--- a/data/resources/ui/logged_in/engines/epic_download.ui
+++ b/data/resources/ui/logged_in/engines/epic_download.ui
@@ -39,6 +39,7 @@
                                 <child>
                                     <object class="GtkListBox" id="details">
                                         <property name="selection-mode">GTK_SELECTION_NONE</property>
+                                        <property name="css-classes">background</property>
                                         <child>
                                             <object class="GtkListBoxRow">
                                                 <child>
diff --git a/data/resources/ui/logged_in/library/asset_detail.ui b/data/resources/ui/logged_in/library/asset_detail.ui
index 13ada34..08974d4 100644
--- a/data/resources/ui/logged_in/library/asset_detail.ui
+++ b/data/resources/ui/logged_in/library/asset_detail.ui
@@ -15,6 +15,7 @@
                     <object class="GtkBox">
                         <property name="orientation">vertical</property>
                         <child>
+                            <!-- TODO: GtkInfoBar is deprecated, switch to AdwBanner -->
                             <object class="GtkInfoBar" id="warning">
                                 <property name="css-classes">warning</property>
                                 <property name="message-type">GTK_MESSAGE_ERROR</property>
@@ -28,8 +29,8 @@
                         <child>
                             <object class="GtkBox">
                                 <property name="orientation">horizontal</property>
-                                <property name="margin-top">24</property>
-                                <property name="margin-bottom">24</property>
+                                <property name="margin-top">12</property>
+                                <property name="margin-bottom">12</property>
                                 <property name="margin-start">12</property>
                                 <property name="margin-end">12</property>
                                 <property name="spacing">6</property>
@@ -45,10 +46,11 @@ pill</property>
                                 </child>
                                 <child>
                                     <object class="GtkLabel" id="title">
-                                        <property name="css-classes">title-1</property>
-                                        <property name="ellipsize">middle</property>
-                                        <property name="halign">center</property>
                                         <property name="hexpand">true</property>
+                                        <property name="halign">center</property>
+                                        <property name="ellipsize">middle</property>
+                                        <!-- <property name="selectable">true</property> --> <!-- setting this messes up titles for some reason -->
+                                        <property name="css-classes">title-1</property>
                                     </object>
                                 </child>
                                 <child>
@@ -69,8 +71,8 @@ circular</property>
                                 <property name="halign">fill</property>
                                 <property name="css-classes">linked</property>
                                 <property name="margin-bottom">12</property>
-                                <property name="margin-start">12</property>
-                                <property name="margin-end">12</property>
+                                <property name="margin-start">24</property>
+                                <property name="margin-end">24</property>
                                 <child>
                                     <object class="GtkButton" id="information_button">
                                         <property name="hexpand">true</property>
@@ -86,11 +88,17 @@ circular</property>
                                     </object>
                                 </child>
                                 <child>
+                                    <!-- TODO: switch to GtkDropDown? -->
                                     <object class="GtkMenuButton" id="actions_menu">
                                         <property name="direction">down</property>
                                         <property name="hexpand">true</property>
                                         <property name="valign">center</property>
-                                        <property name="label" translatable="yes">Actions</property>
+                                        <child>
+                                          <object class="AdwButtonContent">
+                                              <property name="icon-name">view-more-symbolic</property>
+                                              <property name="label" translatable="yes">Actions</property>
+                                          </object>
+                                        </child>
                                         <property name="popover">
                                             <object class="GtkPopover">
                                                 <child>
@@ -113,26 +121,24 @@ circular</property>
                             <object class="GtkRevealer" id="details_revealer">
                                 <property name="reveal-child">true</property>
                                 <child>
-                                    <object class="GtkScrolledWindow">
+                                    <object class="AdwPreferencesPage">
                                         <child>
-                                            <object class="GtkBox" id="details">
-                                                <property name="orientation">vertical</property>
-                                                <property name="vexpand">true</property>
-                                                    <child>
-                                                        <object class="EpicImageOverlay" id="images">
-                                                            <property name="hexpand" bind-source="EpicAssetDetails" bind-property="expanded" bind-flags="sync-create"/>
-                                                            <property name="vexpand">false</property>
-                                                        </object>
-                                                    </child>
+                                            <object class="AdwPreferencesGroup">
                                                 <child>
-                                                    <object class="GtkSeparator">
-                                                        <property name="orientation">horizontal</property>
-                                                    </object>
-                                                </child>
-                                                <child>
-                                                    <object class="GtkListBox" id="details_box">
-                                                        <property name="selection-mode">GTK_SELECTION_NONE</property>
-                                                        <property name="vexpand">true</property>
+                                                    <object class="GtkBox" id="details">
+                                                        <property name="orientation">vertical</property>
+                                                        <property name="spacing">12</property>
+                                                        <child>
+                                                            <object class="EpicImageOverlay" id="images">
+                                                                <property name="hexpand" bind-source="EpicAssetDetails" bind-property="expanded" bind-flags="sync-create"/>
+                                                            </object>
+                                                        </child>
+                                                        <child>
+                                                            <object class="GtkListBox" id="details_box">
+                                                                <property name="selection-mode">GTK_SELECTION_NONE</property>
+                                                                <property name="css-classes">boxed-list</property>
+                                                            </object>
+                                                        </child>
                                                     </object>
                                                 </child>
                                             </object>
diff --git a/data/resources/ui/logged_in/library/image_stack.ui b/data/resources/ui/logged_in/library/image_stack.ui
index ea4c9e9..598085a 100644
--- a/data/resources/ui/logged_in/library/image_stack.ui
+++ b/data/resources/ui/logged_in/library/image_stack.ui
@@ -10,19 +10,14 @@
                         <child>
                             <object class="GtkOverlay" id="navigation">
                                 <property name="hexpand" bind-source="EpicImageOverlay" bind-property="hexpand" bind-flags="sync-create"/>
-                                <property name="child">
-                                    <object class="AdwClamp">
-                                        <property name="orientation">vertical</property>
-                                        <property name="maximum-size">300</property>
-                                        <property name="height-request">400</property>
-                                        <child>
-                                            <object class="AdwCarousel" id="stack">
-                                                <property name="vexpand">True</property>
-                                                <property name="hexpand">True</property>
-                                            </object>
-                                        </child>
-                                    </object>
-                                </property>
+                                    <child>
+                                        <object class="AdwCarousel" id="stack">
+                                            <property name="vexpand">true</property>
+                                            <property name="height-request">320</property>
+                                            <property name="hexpand">true</property>
+                                            <property name="allow-scroll-wheel">false</property>
+                                        </object>
+                                    </child>
                                 <child type="overlay">
                                     <object class="GtkButton">
                                         <property name="halign">start</property>
@@ -30,7 +25,7 @@
                                         <property name="margin-start">12</property>
                                         <property name="css-classes">osd
 circular</property>
-                                        <property name="opacity">0.75</property>
+                                        <property name="opacity">0.8</property>
                                         <property name="icon-name">go-previous-symbolic</property>
                                         <property name="action-name">image_stack.prev</property>
                                         <property name="tooltip-text" translatable="yes">Previous Image</property>
@@ -43,7 +38,7 @@ circular</property>
                                         <property name="margin-end">12</property>
                                       <property name="css-classes">osd
 circular</property>
-                                        <property name="opacity">0.75</property>
+                                        <property name="opacity">0.8</property>
                                         <property name="icon-name">go-next-symbolic</property>
                                         <property name="action-name">image_stack.next</property>
                                         <property name="tooltip-text" translatable="yes">Next Image</property>
@@ -52,7 +47,7 @@ circular</property>
                             </object>
                         </child>
                         <child>
-                            <object class="AdwCarouselIndicatorLines">
+                            <object class="AdwCarouselIndicatorDots">
                                 <property name="carousel">stack</property>
                             </object>
                         </child>
diff --git a/data/resources/ui/logged_in/log_line.ui b/data/resources/ui/logged_in/log_line.ui
index 82904f4..461bed0 100644
--- a/data/resources/ui/logged_in/log_line.ui
+++ b/data/resources/ui/logged_in/log_line.ui
@@ -1,43 +1,38 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
     <template class="EpicLogLine" parent="GtkBox">
+        <property name="margin-top">6</property>
+        <property name="margin-bottom">6</property>
+        <property name="margin-start">12</property>
+        <property name="margin-end">12</property>
+        <property name="spacing">12</property>
         <child>
-            <object class="GtkBox">
-                <property name="margin-top">6</property>
-                <property name="margin-bottom">6</property>
-                <property name="margin-start">12</property>
-                <property name="margin-end">12</property>
-                <property name="spacing">12</property>
-                <child>
-                    <object class="GtkImage">
-                        <property name="icon_name">dialog-warning-symbolic</property>
-                        <property name="visible" bind-source="EpicLogLine" bind-property="crash" bind-flags="sync-create"/>
-                        <property name="tooltip-text">Crash log</property>
-                        <property name="css-classes">warning</property>
-                    </object>
-                </child>
-                <child>
-                    <object class="GtkLabel">
-                        <property name="label" translatable="yes" bind-source="EpicLogLine" bind-property="label" bind-flags="sync-create"/>
-                        <property name="tooltip-text" translatable="yes" bind-source="EpicLogLine" bind-property="path" bind-flags="sync-create"/>
-                        <property name="use-markup">true</property>
-                        <property name="hexpand">true</property>
-                        <property name="ellipsize">middle</property>
-                        <property name="halign">start</property>
-                        <property name="css-classes">heading</property>
-                    </object>
-                </child>
+            <object class="GtkImage">
+                <property name="icon_name">dialog-warning-symbolic</property>
+                <property name="visible" bind-source="EpicLogLine" bind-property="crash" bind-flags="sync-create"/>
+                <property name="tooltip-text">Crash log</property>
+                <property name="css-classes">warning</property>
+            </object>
+        </child>
+        <child>
+            <object class="GtkLabel">
+                <property name="label" translatable="yes" bind-source="EpicLogLine" bind-property="label" bind-flags="sync-create"/>
+                <property name="tooltip-text" translatable="yes" bind-source="EpicLogLine" bind-property="path" bind-flags="sync-create"/>
+                <property name="use-markup">true</property>
+                <property name="hexpand">true</property>
+                <property name="halign">start</property>
+                <property name="css-classes">heading</property>
+            </object>
+        </child>
+        <child>
+            <object class="GtkButton">
+                <property name="halign">end</property>
+                <property name="valign">center</property>
+                <property name="action-name">log_line.dir</property>
                 <child>
-                    <object class="GtkButton">
-                        <property name="halign">end</property>
-                        <property name="valign">center</property>
-                        <property name="action-name">log_line.dir</property>
-                        <child>
-                            <object class="AdwButtonContent">
-                                <property name="icon-name">folder-open-symbolic</property>
-                                <property name="label" translatable="yes">Open</property>
-                            </object>
-                        </child>
+                    <object class="AdwButtonContent">
+                        <property name="icon-name">folder-open-symbolic</property>
+                        <property name="label" translatable="yes">Open</property>
                     </object>
                 </child>
             </object>
diff --git a/data/resources/ui/logged_in/logs.ui b/data/resources/ui/logged_in/logs.ui
index a18f2ce..aee573e 100644
--- a/data/resources/ui/logged_in/logs.ui
+++ b/data/resources/ui/logged_in/logs.ui
@@ -1,15 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
     <template class="EpicLogs" parent="GtkBox">
-        <property name="hexpand">1</property>
-        <property name="vexpand">1</property>
         <property name="orientation">vertical</property>
         <child>
-            <object class="GtkScrolledWindow">
-                <property name="height-request">300</property>
+            <object class="AdwPreferencesPage">
                 <child>
-                    <object class="GtkListView" id="logs">
-                    </object>
+                    <object class="GtkListView" id="logs"/>
                 </child>
             </object>
         </child>
diff --git a/data/resources/ui/logged_in/projects/project.ui b/data/resources/ui/logged_in/projects/project.ui
index bf21284..0049046 100644
--- a/data/resources/ui/logged_in/projects/project.ui
+++ b/data/resources/ui/logged_in/projects/project.ui
@@ -3,7 +3,6 @@
     <requires lib="gtk" version="4.0"/>
     <template class="EpicProject" parent="GtkBox">
         <property name="valign">center</property>
-        <property name="width-request">300</property>
         <child>
             <object class="AdwAvatar" id="thumbnail">
                 <property name="icon-name">ue-logo-symbolic</property>
diff --git a/data/resources/ui/logged_in/projects/project_detail.ui b/data/resources/ui/logged_in/projects/project_detail.ui
index 4b9dc53..47d30b1 100644
--- a/data/resources/ui/logged_in/projects/project_detail.ui
+++ b/data/resources/ui/logged_in/projects/project_detail.ui
@@ -12,74 +12,81 @@
                 <child>
                     <object class="GtkBox">
                         <property name="orientation">vertical</property>
+                        <property name="css-classes">background</property>
                         <child>
                             <object class="GtkBox">
-                                <property name="orientation">vertical</property>
                                 <property name="margin-top">12</property>
                                 <property name="margin-bottom">12</property>
                                 <property name="margin-start">12</property>
-                                <property name="margin-end">12</property>
-                                <property name="spacing">24</property>
+                                <property name="margin-end">96</property>
+                                <property name="spacing">12</property>
                                 <child>
-                                    <object class="GtkBox">
-                                        <property name="spacing">12</property>
-                                        <child>
-                                            <object class="GtkButton">
-                                                <property name="halign">start</property>
-                                                <property name="action-name">project_details.close</property>
-                                                <property name="icon-name">process-stop-symbolic</property>
-                                                <property name="css-classes">pill
+                                    <object class="GtkButton">
+                                        <property name="halign">start</property>
+                                        <property name="action-name">project_details.close</property>
+                                        <property name="icon-name">process-stop-symbolic</property>
+                                        <property name="css-classes">pill
 flat</property>
-                                            </object>
-                                        </child>
-                                      <child>
-                                          <object class="GtkLabel" id="title">
-                                              <property name="ellipsize">middle</property>
-                                              <property name="halign">center</property>
-                                              <property name="css-classes">title-1</property>
-                                          </object>
-                                        </child>
                                     </object>
                                 </child>
                                 <child>
-                                    <object class="GtkButton" id="launch_button">
-                                        <property name="halign">start</property>
-                                        <property name="name">project_launch_button</property>
-                                        <property name="action-name">project_details.launch_project</property>
-                                        <property name="css-classes">pill
-suggested-action</property>
-                                        <child>
-                                            <object class="AdwButtonContent">
-                                                <property name="icon-name">media-playback-start-symbolic</property>
-                                                <property name="label" translatable="yes">Launch</property>
-                                            </object>
-                                        </child>
+                                    <object class="GtkLabel" id="title">
+                                        <property name="hexpand">true</property>
+                                        <property name="halign">center</property>
+                                        <property name="ellipsize">middle</property>
+                                        <property name="css-classes">title-1</property>
                                     </object>
                                 </child>
                             </object>
                         </child>
+                        <child>
+                            <object class="GtkSeparator"/>
+                        </child>
                         <child>
                             <object class="GtkRevealer" id="details_revealer">
                                 <property name="reveal-child">true</property>
                                 <property name="vexpand">True</property>
                                 <child>
-                                    <object class="GtkScrolledWindow">
+                                    <object class="AdwPreferencesPage">
                                         <child>
-                                            <object class="GtkBox">
-                                                <property name="vexpand">True</property>
-                                                <property name="orientation">vertical</property>
+                                            <object class="AdwPreferencesGroup">
+                                                <child>
+                                                    <object class="GtkButton" id="launch_button">
+                                                        <property name="halign">start</property>
+                                                        <property name="name">project_launch_button</property>
+                                                        <property name="action-name">project_details.launch_project</property>
+                                                        <property name="css-classes">pill
+suggested-action</property>
+                                                        <child>
+                                                            <object class="AdwButtonContent">
+                                                                <property name="icon-name">media-playback-start-symbolic</property>
+                                                                <property name="label" translatable="yes">Launch</property>
+                                                            </object>
+                                                        </child>
+                                                    </object>
+                                                </child>
+                                            </object>
+                                        </child>
+
+                                        <child>
+                                            <object class="AdwPreferencesGroup">
+                                                <property name="title">General</property>
                                                 <child>
                                                     <object class="GtkListBox" id="details">
                                                         <property name="selection-mode">GTK_SELECTION_NONE</property>
+                                                        <property name="css-classes">boxed-list</property>
                                                     </object>
                                                 </child>
+                                            </object>
+                                        </child>
+                                        <child>
+                                            <object class="AdwPreferencesGroup">
+                                                <property name="title">Details</property>
                                                 <child>
                                                     <object class="AdwExpanderRow" id="logs_row">
                                                         <property name="title" translatable="yes">Logs</property>
-                                                        <property name="expanded">0</property>
                                                         <child>
-                                                            <object class="EpicLogs" id="logs">
-                                                            </object>
+                                                            <object class="EpicLogs" id="logs"/>
                                                         </child>
                                                     </object>
                                                 </child>
@@ -87,7 +94,6 @@ suggested-action</property>
                                                     <object class="AdwExpanderRow" id="config_row">
                                                         <property name="visible">false</property>
                                                         <property name="title" translatable="yes">Config</property>
-                                                        <property name="expanded">0</property>
                                                         <child>
                                                             <object class="GtkBox">
                                                             </object>
@@ -98,7 +104,6 @@ suggested-action</property>
                                                     <object class="AdwExpanderRow" id="plugins_row">
                                                         <property name="visible">false</property>
                                                         <property name="title" translatable="yes">Plugins</property>
-                                                        <property name="expanded">0</property>
                                                         <child>
                                                             <object class="EpicPlugins" id="plugins">
                                                             </object>
@@ -109,7 +114,6 @@ suggested-action</property>
                                                     <object class="AdwExpanderRow" id="modules_row">
                                                         <property name="visible">false</property>
                                                         <property name="title" translatable="yes">Modules</property>
-                                                        <property name="expanded">0</property>
                                                         <child>
                                                             <object class="GtkBox">
                                                             </object>
@@ -120,7 +124,6 @@ suggested-action</property>
                                                     <object class="AdwExpanderRow" id="root_directories">
                                                         <property name="visible">false</property>
                                                         <property name="title" translatable="yes">Additional Root Directories</property>
-                                                        <property name="expanded">0</property>
                                                         <child>
                                                             <object class="GtkBox">
                                                             </object>
@@ -131,7 +134,6 @@ suggested-action</property>
                                                     <object class="AdwExpanderRow" id="build_steps">
                                                         <property name="visible">false</property>
                                                         <property name="title" translatable="yes">Build steps</property>
-                                                        <property name="expanded">0</property>
                                                     </object>
                                                 </child>
                                             </object>
diff --git a/data/resources/ui/logged_in/projects/projects.ui b/data/resources/ui/logged_in/projects/projects.ui
index c0d65fb..6451fa3 100644
--- a/data/resources/ui/logged_in/projects/projects.ui
+++ b/data/resources/ui/logged_in/projects/projects.ui
@@ -19,6 +19,7 @@
                         <property name="halign">fill</property>
                         <property name="valign">fill</property>
                         <property name="max-columns">255</property>
+                        <!-- <property name="css-classes">background</property> -->
                     </object>
                 </property>
             </object>
diff --git a/data/resources/ui/window.ui b/data/resources/ui/window.ui
index d8596f0..52b1ccb 100644
--- a/data/resources/ui/window.ui
+++ b/data/resources/ui/window.ui
@@ -18,8 +18,9 @@
         </section>
     </menu>
     <template class="EpicAssetManagerWindow" parent="GtkApplicationWindow">
-        <property name="default-width">700</property>
-        <property name="default-height">450</property>
+        <property name="default-width">650</property>
+        <property name="default-height">580</property>
+        <property name="height-request">480</property>
         <property name="title" translatable="yes">Epic Asset Manager</property>
         <child type="titlebar">
             <object class="AdwHeaderBar" id="headerbar">
diff --git a/src/ui/widgets/logged_in/engines/docker_download.rs b/src/ui/widgets/logged_in/engines/docker_download.rs
index 97a47e1..e84ce13 100644
--- a/src/ui/widgets/logged_in/engines/docker_download.rs
+++ b/src/ui/widgets/logged_in/engines/docker_download.rs
@@ -337,10 +337,9 @@ impl DockerEngineDownload {
                 combo.set_hexpand(true);
                 self_
                     .details
-                    .append(&crate::window::EpicAssetManagerWindow::create_details_row(
-                        "Available Versions",
+                    .append(&crate::window::EpicAssetManagerWindow::create_widget_row(
+                        "Available Versions:",
                         &combo,
-                        &self_.details_group,
                     ));
 
                 let row = gtk4::ListBoxRow::new();
@@ -400,10 +399,9 @@ impl DockerEngineDownload {
 
                 self_
                     .details
-                    .append(&crate::window::EpicAssetManagerWindow::create_details_row(
+                    .append(&crate::window::EpicAssetManagerWindow::create_widget_row(
                         "Download Size",
                         &size_label,
-                        &self_.details_group,
                     ));
             });
         }
diff --git a/src/ui/widgets/logged_in/engines/engine_detail.rs b/src/ui/widgets/logged_in/engines/engine_detail.rs
index ced62f2..82ee6fb 100644
--- a/src/ui/widgets/logged_in/engines/engine_detail.rs
+++ b/src/ui/widgets/logged_in/engines/engine_detail.rs
@@ -233,41 +233,29 @@ impl EpicEngineDetails {
         // Path
         if let Some(path) = &data.path() {
             self_.logs.add_path(&format!("{}/Engine", &path));
-            let path_box = gtk4::Box::new(gtk4::Orientation::Horizontal, 12);
-            let label = gtk4::Label::new(Some(path));
-            label.set_ellipsize(gtk4::pango::EllipsizeMode::End);
-            path_box.append(&label);
-            let button = gtk4::Button::with_icon_and_label("folder-open-symbolic", "Open");
-            button.connect_clicked(clone!(@weak self as engine => move |_| {
-                engine.open_dir();
-            }));
-            path_box.append(&button);
+            let text = format!("Path: {path}");
+            let widget = gtk4::Button::with_icon_and_label("folder-open-symbolic", "Open");
+            widget.connect_clicked(clone!(@weak self as engine => move |_| {engine.open_dir();}));
             self_
                 .details
-                .append(&crate::window::EpicAssetManagerWindow::create_details_row(
-                    "Path",
-                    &path_box,
-                    &self_.details_group,
+                .append(&crate::window::EpicAssetManagerWindow::create_widget_row(
+                    &text, &widget,
                 ));
         }
 
         if let Some(branch) = &data.branch() {
             self_
                 .details
-                .append(&crate::window::EpicAssetManagerWindow::create_details_row(
-                    "Branch",
-                    &gtk4::Label::new(Some(branch)),
-                    &self_.details_group,
+                .append(&crate::window::EpicAssetManagerWindow::create_info_row(
+                    "Branch: {&branch}",
                 ));
         }
 
         if data.needs_update() {
             self_
                 .details
-                .append(&crate::window::EpicAssetManagerWindow::create_details_row(
-                    "Needs update",
-                    &gtk4::Label::new(None),
-                    &self_.details_group,
+                .append(&crate::window::EpicAssetManagerWindow::create_info_row(
+                    "Needs update: {&None}",
                 ));
         }
     }
diff --git a/src/ui/widgets/logged_in/library/actions/mod.rs b/src/ui/widgets/logged_in/library/actions/mod.rs
index 193c77a..4a322da 100644
--- a/src/ui/widgets/logged_in/library/actions/mod.rs
+++ b/src/ui/widgets/logged_in/library/actions/mod.rs
@@ -466,13 +466,11 @@ impl EpicAssetActions {
 
     fn add_detail(&self, label: &str, widget: &impl IsA<gtk4::Widget>) {
         let self_ = self.imp();
-        self_.additional_details.append(
-            &crate::window::EpicAssetManagerWindow::create_details_row(
-                label,
-                widget,
-                &self_.details_group,
-            ),
-        );
+        self_
+            .additional_details
+            .append(&crate::window::EpicAssetManagerWindow::create_widget_row(
+                label, widget,
+            ));
     }
 
     pub fn version_selected(&self) {
diff --git a/src/ui/widgets/logged_in/library/asset_detail.rs b/src/ui/widgets/logged_in/library/asset_detail.rs
index 3e04c9c..e10a126 100644
--- a/src/ui/widgets/logged_in/library/asset_detail.rs
+++ b/src/ui/widgets/logged_in/library/asset_detail.rs
@@ -230,6 +230,8 @@ impl EpicAssetDetails {
             "close",
             clone!(@weak self as details => move |_, _| {
                 details.collapse();
+                println!("FRRR")
+
             })
         );
         action!(
@@ -380,7 +382,7 @@ impl EpicAssetDetails {
                         self_.warning.set_revealed(false);
                         self.create_actions_button(
                             "Add to Project",
-                            "edit-select-all-symbolic",
+                            "folder-new-symbolic",
                             "details.add_to_project",
                         );
                     }
@@ -388,12 +390,12 @@ impl EpicAssetDetails {
                         self_.warning.set_revealed(false);
                         self.create_actions_button(
                             "Add to Project",
-                            "edit-select-all-symbolic",
+                            "folder-new-symbolic",
                             "details.add_to_project",
                         );
                         self.create_actions_button(
                             "Create Project",
-                            "folder-new-symbolic",
+                            "list-add-symbolic",
                             "details.create_project",
                         );
                     }
@@ -517,9 +519,9 @@ impl EpicAssetDetails {
         while let Some(el) = self_.details_box.first_child() {
             self_.details_box.remove(&el);
         }
-
         if let Some(dev_name) = &asset.developer {
-            self.add_info_row("Developer", &gtk4::Label::new(Some(dev_name)));
+            let text = format!("Developer: {dev_name}");
+            self.add_info_row(&text);
         }
 
         if let Some(categories) = &asset.categories {
@@ -538,48 +540,52 @@ impl EpicAssetDetails {
                     cats.push(category.path.clone());
                 }
             }
-            self.add_info_row("Categories", &gtk4::Label::new(Some(&cats.join(", "))));
+            let cats = &cats.join(", ");
+            let text = format!("Categories: {cats}");
+            self.add_info_row(&text);
         }
 
         if let Some(platforms) = &asset.platforms() {
-            self.add_info_row("Platforms", &gtk4::Label::new(Some(&platforms.join(", "))));
+            let platforms = &platforms.join(", ");
+            let text = format!("Platforms: {platforms}");
+            self.add_info_row(&text);
         }
 
         if let Some(updated) = &asset.last_modified_date {
-            self.add_info_row("Updated", &gtk4::Label::new(Some(&updated.to_rfc3339())));
+            let updated = updated.to_rfc3339();
+            let text = format!("Updated: {updated}");
+            self.add_info_row(&text);
         }
 
         if let Some(compatible_apps) = &asset.compatible_apps() {
-            self.add_info_row(
-                "Compatible with",
-                &gtk4::Label::new(Some(&compatible_apps.join(", ").replace("UE_", ""))),
-            );
+            if !compatible_apps.is_empty() {
+                let compat = &compatible_apps.join(", ").replace("UE_", "");
+                let text = format!("Compatible with: {compat}");
+                self.add_info_row(&text);
+            }
         }
 
         if let Some(desc) = &asset.long_description {
-            let label = gtk4::Label::builder().wrap(true).xalign(0.0).build();
-            label.set_markup(&html2pango::matrix_html_to_markup(desc).replace("\n\n", "\n"));
-            self.add_info_row("", &label);
+            let text = &html2pango::matrix_html_to_markup(desc).replace("\n\n", "\n");
+            self.add_info_row(&text);
         }
 
         if let Some(desc) = &asset.technical_details {
-            let label = gtk4::Label::builder().wrap(true).xalign(0.0).build();
-            label.set_markup(&html2pango::matrix_html_to_markup(desc).replace("\n\n", "\n"));
-            self.add_info_row("", &label);
+            let text = &html2pango::matrix_html_to_markup(desc).replace("\n\n", "\n");
+            self.add_info_row(&text);
         }
-
         self.check_favorite();
     }
 
-    fn add_info_row(&self, title: &str, widget: &impl IsA<gtk4::Widget>) {
-        let self_ = self.imp();
-        self_
-            .details_box
-            .append(&crate::window::EpicAssetManagerWindow::create_details_row(
-                title,
-                widget,
-                &self_.details_group,
-            ));
+    fn add_info_row(&self, text: &str) {
+        if !&text.is_empty() {
+            let self_ = self.imp();
+            self_
+                .details_box
+                .append(&crate::window::EpicAssetManagerWindow::create_info_row(
+                    text,
+                ));
+        }
     }
 
     pub fn is_expanded(&self) -> bool {
diff --git a/src/ui/widgets/logged_in/projects/project_detail.rs b/src/ui/widgets/logged_in/projects/project_detail.rs
index d5c772f..38d4a63 100644
--- a/src/ui/widgets/logged_in/projects/project_detail.rs
+++ b/src/ui/widgets/logged_in/projects/project_detail.rs
@@ -317,37 +317,28 @@ impl UnrealProjectDetails {
 
         self_
             .details
-            .append(&crate::window::EpicAssetManagerWindow::create_details_row(
-                "Engine:",
-                &combo,
-                &self_.details_group,
+            .append(&crate::window::EpicAssetManagerWindow::create_widget_row(
+                "Engine:", &combo,
             ));
 
-        // Path
-        let path_box = gtk4::Box::new(gtk4::Orientation::Horizontal, 12);
-        let label = gtk4::Label::new(Some(parent.to_str().unwrap()));
-        label.set_ellipsize(gtk4::pango::EllipsizeMode::End);
-        path_box.append(&label);
-        let button = gtk4::Button::with_icon_and_label("folder-open-symbolic", "Open");
-        button.connect_clicked(clone!(@weak self as project => move |_| {
-            project.open_dir();
-        }));
-        path_box.append(&button);
+        // Engine Association
+        let text = &project.engine_association;
+        let text = format!("Engine Association: {text}");
         self_
             .details
-            .append(&crate::window::EpicAssetManagerWindow::create_details_row(
-                "Path:",
-                &path_box,
-                &self_.details_group,
+            .append(&crate::window::EpicAssetManagerWindow::create_info_row(
+                &text,
             ));
 
-        // Engine Association
+        // Path
+        let text = parent.to_str().unwrap();
+        let text = format!("Path: {text}");
+        let button = gtk4::Button::with_icon_and_label("folder-open-symbolic", "Open");
+        button.connect_clicked(clone!(@weak self as project => move |_| {project.open_dir();}));
         self_
             .details
-            .append(&crate::window::EpicAssetManagerWindow::create_details_row(
-                "Engine Association:",
-                &gtk4::Label::new(Some(&project.engine_association)),
-                &self_.details_group,
+            .append(&crate::window::EpicAssetManagerWindow::create_widget_row(
+                &text, &button,
             ));
     }
 
diff --git a/src/window.rs b/src/window.rs
index 96a2c2b..feea79d 100644
--- a/src/window.rs
+++ b/src/window.rs
@@ -459,23 +459,37 @@ impl EpicAssetManagerWindow {
             .set_download_manager(&self_.download_manager);
     }
 
-    pub fn create_details_row(
-        label: &str,
-        widget: &impl IsA<gtk4::Widget>,
-        size_group: &gtk4::SizeGroup,
-    ) -> ListBoxRow {
+    pub fn create_info_row(text: &str) -> ListBoxRow {
         let b = gtk4::Box::new(gtk4::Orientation::Horizontal, 12);
-        b.set_margin_start(6);
-        b.set_margin_end(6);
-        b.set_margin_bottom(3);
-        b.set_margin_top(3);
+        b.set_margin_start(12);
+        b.set_margin_end(12);
+        b.set_margin_top(8);
+        b.set_margin_bottom(8);
+        let label = gtk4::Label::new(Some(&text));
+        label.set_use_markup(true);
+        label.set_selectable(true);
+        label.set_wrap(true);
+        b.append(&label);
+        let row = gtk4::ListBoxRow::builder().activatable(false).child(&b);
+        row.build()
+    }
+
+    pub fn create_widget_row(label: &str, widget: &impl IsA<gtk4::Widget>) -> ListBoxRow {
+        let b = gtk4::Box::new(gtk4::Orientation::Horizontal, 12);
+        b.set_margin_start(12);
+        b.set_margin_end(12);
+        b.set_margin_top(8);
+        b.set_margin_bottom(8);
         let label = gtk4::Label::new(Some(label));
-        label.set_xalign(1.0);
+        label.set_hexpand(true);
+        label.set_halign(gtk4::Align::Start);
         label.set_valign(gtk4::Align::Center);
-        size_group.add_widget(&label);
+        label.set_selectable(true);
+        label.set_ellipsize(gtk4::pango::EllipsizeMode::End);
         b.append(&label);
+        widget.set_halign(gtk4::Align::End);
         b.append(widget);
-        let row = gtk4::ListBoxRow::builder().child(&b);
+        let row = gtk4::ListBoxRow::builder().activatable(false).child(&b);
         row.build()
     }