diff --git a/_embed/public/css/styles.css b/_embed/public/css/styles.css
index 47d38520..de714cbe 100644
--- a/_embed/public/css/styles.css
+++ b/_embed/public/css/styles.css
@@ -1128,7 +1128,7 @@ footer a:hover {
     display: none;
   }
   #bottom-bar>*:first-child {
-    max-width: calc(100% - 16em);
+    max-width: calc(100% - 16em) !important;
   }
   #main-actions {
     position: fixed;
diff --git a/_embed/templates/base.tmpl b/_embed/templates/base.tmpl
index 36c7af0c..01a6e207 100644
--- a/_embed/templates/base.tmpl
+++ b/_embed/templates/base.tmpl
@@ -79,13 +79,17 @@
                 </div>
                 {{- end }}
 
+                {{- if .IsDir }}
                 <div class="action" id="open">
                     <i class="material-icons" title="See raw">open_in_new</i>
+                    <span>See raw</span>
                 </div>
+                {{- end }}
 
-                {{- if .User.AllowEdit }}
+                {{- if and (.User.AllowEdit) (.IsDir) }}
                 <div class="action" id="move">
                     <i class="material-icons" title="Move">forward</i>
+                    <span>Move file</span>
                 </div>
                 {{- end }}
 
@@ -95,7 +99,7 @@
                 </div>
                 {{- end }}
 
-                {{- if .User.AllowEdit }}
+                {{- if and .User.AllowEdit .IsDir }}
                 <div class="action" id="delete">
                     <i class="material-icons" title="Delete">delete</i><span>Delete</span>
                 </div>
@@ -127,6 +131,26 @@
                 </div>
                 {{- end }}
 
+                {{- if not .IsDir }}
+                <div class="action" id="open">
+                    <i class="material-icons" title="See raw">open_in_new</i>
+                    <span>See raw</span>
+                </div>
+                {{- end }}
+
+                {{- if and .User.AllowEdit (not .IsDir) }}
+                <div class="action" id="delete">
+                    <i class="material-icons" title="Delete">delete</i><span>Delete</span>
+                </div>
+                {{- end }}
+
+                {{- if and (.User.AllowEdit) (not .IsDir) }}
+                <div class="action" id="move">
+                    <i class="material-icons" title="Move">forward</i>
+                    <span>Move file</span>
+                </div>
+                {{- end }}
+
                 <div {{ if .IsDir }}data-dropdown{{ end }} class="action" id="download">
                     {{- if not .IsDir}}<a href="?download=true">{{ end }}
                     <i class="material-icons" title="Download">file_download</i><span>Download</span>