diff --git a/sao/src/sao.less b/sao/src/sao.less
index ca74753698..79a24d210b 100644
--- a/sao/src/sao.less
+++ b/sao/src/sao.less
@@ -285,7 +285,8 @@ html[theme="default"] {
 }
 
 #tabcontent {
-    display: block;
+    display: flex;
+    flex: 1;
     width: 100%;
 
     > .tab-pane > .panel {
@@ -358,11 +359,6 @@ html[theme="default"] {
     }
 }
 
-#tabcontent[data-view-type="tree"] {
-    display: flex;
-    flex: 1;
-}
-
 @media screen and (max-width: @screen-sm-max) {
     #tabcontent {
         .sidebar {
@@ -370,6 +366,8 @@ html[theme="default"] {
         }
     }
     #tabcontent[data-view-type="form"] {
+        display: block;
+
         > .tab-pane > .panel > .panel-body {
             flex-direction: column;
         }
@@ -419,6 +417,16 @@ html[theme="default"] {
     display: flex;
     flex-direction: column;
     flex: 1;
+    min-height: 200px;
+
+    .screen-container {
+        overflow: auto;
+    }
+
+    .btn-group {
+        margin-bottom: 10px;
+        margin-top: 10px;
+    }
 }
 
 .chat {
@@ -1166,7 +1174,7 @@ img.icon {
         object {
             object-fit: scale-down;
             object-position: center top;
-            width: 100%;
+            max-width: 100%;
             min-height: 50vh;
             height: 100%;
             @media screen and (max-width: @screen-xs-max) {
diff --git a/sao/src/tab.js b/sao/src/tab.js
index d68080e0d7..4739d0da70 100644
--- a/sao/src/tab.js
+++ b/sao/src/tab.js
@@ -1363,7 +1363,7 @@
             screen.windows.push(preview);
 
             screen.switch_view().done(function() {
-                el.append(screen.screen_container.el);
+                el.prepend(screen.screen_container.el);
             });
             return el;
         },