diff --git a/fp-interface/themes/leggero/leggero-v2/res/admin.css b/fp-interface/themes/leggero/leggero-v2/res/admin.css
index a808dfb..b955e5a 100755
--- a/fp-interface/themes/leggero/leggero-v2/res/admin.css
+++ b/fp-interface/themes/leggero/leggero-v2/res/admin.css
@@ -43,7 +43,7 @@ body#inline-body { background: white }
 	font-size: 0.85em;
 	margin: 0 auto 0 auto;
 	background-color: rgba(255,255,255,1);
-	border-radius: 3px
+	border-radius: 12px
 }
 
 
@@ -61,7 +61,8 @@ body#inline-body { background: white }
 		#body-container {
 			padding: unset;
 			padding-top: 5px;
-			min-width: 100%
+			min-width: 100%;
+			border-radius: unset
 		}
 	}
 }
@@ -89,9 +90,7 @@ ul#admin-tabmenu {
 	margin: 1em 0 0 0;
 	padding: .5em;
 	background: #000;
-	-moz-border-radius-topleft:3px;
-	-moz-border-radius-topright:3px;
-	border-radius: 3px 3px 0 0
+	border-radius: 5px
 }
 
 ul#admin-tabmenu li {
@@ -124,13 +123,17 @@ ul#admin-tabmenu li a.admin-tab-current { font-weight: bold }
 
 /* ===== submenu ====== */
 #admin-submenu {
-	background: #eee; 
-	padding: .5em;
-	border: 1px solid #ccc;
-	border-radius: 0 0 3px 3px
+	background: #e6e6e6;
+	padding: 0.5em;
+	width: 95%;
+	max-width: fit-content;
+	display: inline-block;
+	border-radius: 0 0 5px 5px;
+	position: relative;
+	left: 5px
 }
 
-#admin-submenu li { display:inline; font-size: 80% }
+#admin-submenu li { display: inline; font-size: 80% }
 
 #admin-submenu li a {
 	padding: 0 1em ;
@@ -190,11 +193,11 @@ input#subject {
 	line-height: 1em
 }
 
-#admin-bbcode-toolbar p img { vertical-align: middle }
+#admin-bbcode-toolbar p img { vertical-align: middle; cursor: pointer }
 
 #admin-bbcode-toolbar select { width: 10em }
 
-#admin-content table { width: 100% }
+#admin-content table { width: 100%; margin-bottom: 2em }
 
 #admin-content td {
 	font-size: 0.8em;
@@ -218,13 +221,13 @@ input#subject {
 	padding: 8px
 }
 
-#admin-content tr:first-child th:last-child { border-top-right-radius: 3px }
+#admin-content tr:first-child th:last-child { border-top-right-radius: 5px }
 
-#admin-content tr:first-child th:first-child { border-top-left-radius: 3px }
+#admin-content tr:first-child th:first-child { border-top-left-radius: 5px }
 
-#admin-content tr:last-child td:last-child { border-bottom-right-radius: 3px }
+#admin-content tr:last-child td:last-child { border-bottom-right-radius: 5px }
 
-#admin-content tr:last-child td:first-child { border-bottom-left-radius: 3px }
+#admin-content tr:last-child td:first-child { border-bottom-left-radius: 5px }
 
 input.maxsize, select.maxsize { width: 99% }
 
@@ -277,7 +280,7 @@ input.maxsize, select.maxsize { width: 99% }
 
 
 /* ===== PREVIEW SETTINGS ===== */
-#post-preview { min-width: 40em }
+#post-preview { min-width: 28em }
 
 #post-preview .entry { padding: 2em; max-height: 20em; overflow: auto  }
 
@@ -305,6 +308,14 @@ input.maxsize, select.maxsize { width: 99% }
 	margin: 1em
 }
 
+input[type=file]::file-selector-button { cursor: pointer }
+
+table.plugin_gallerycaptions_captionstable tr:first-child td:first-child { border-top-left-radius: 5px }
+
+table.plugin_gallerycaptions_captionstable tr:first-child td:last-child { border-top-right-radius: 5px }
+
+table.plugin_gallerycaptions_captionstable img { border-radius: 3px }
+
 /* (applies only to the inline version */
 #upload { margin-top: .5em }
 
@@ -344,7 +355,7 @@ input.maxsize, select.maxsize { width: 99% }
 
 
 /* ===== WIDGET PANEL ====== */
-#admin-widgetset-list { width: 30em }
+#admin-widgetset-list { width: 30em; max-width: 55% }
 
 #admin-widgetset-list ul {
 	list-style-type: none;
@@ -362,11 +373,12 @@ li.admin-widgetset {
 
 #available-widgets {
 	font-size: 80%;
-	float:right;
+	float: right;
 	border: 1px solid #ddd;
 	background: #eee;
 	padding: 1em;
 	width: 30%;
+	min-width: 20em;
 	z-index: 1000;
 	position: relative;
 	text-align: left;
diff --git a/fp-interface/themes/leggero/leggero-v2/res/common.css b/fp-interface/themes/leggero/leggero-v2/res/common.css
index 1794b73..58a4c0d 100644
--- a/fp-interface/themes/leggero/leggero-v2/res/common.css
+++ b/fp-interface/themes/leggero/leggero-v2/res/common.css
@@ -96,6 +96,13 @@ legend {
 	font-style: oblique
 }
 
+select,
+input[type=submit],
+input[type=reset],
+input[type=button],
+input[type=radio],	
+input[type=checkbox] { cursor: pointer }
+
 input, textarea, select {
 	padding: .2em;
 	border: 1px solid #999;
@@ -194,7 +201,7 @@ h4 { font-size: 1.2em }
 		margin: 0 auto 0 auto;
 		padding: 5px;
 		background-color: rgba(0,0,0,0.75);
-		border-radius: 3px
+		border-radius: 12px
 	}
 
 	/* ===== MAIN ===== */
@@ -425,8 +432,7 @@ h4#addcomment { clear: both }
 	input[type=radio],	
 	input[type=checkbox] {
 		vertical-align: middle;
-		margin-bottom: 0.4em;
-		cursor: pointer
+		margin-bottom: 0.4em
 	}
 
 	.photoswipe figure img { /* PhotoSwipe */
diff --git a/fp-plugins/bbcode/tpls/toolbar.tpl b/fp-plugins/bbcode/tpls/toolbar.tpl
index a89eab8..3562029 100755
--- a/fp-plugins/bbcode/tpls/toolbar.tpl
+++ b/fp-plugins/bbcode/tpls/toolbar.tpl
@@ -22,6 +22,8 @@
 		<img src="fp-plugins/bbcode/res/toolbaricons/code.png" id="bb_code" accesskey="" alt="code" title="{$lang.admin.plugin.bbcode.editor.codetitle}" onclick="insBBCode('code');" />
 		<img src="fp-plugins/bbcode/res/toolbaricons/html.png" id="bb_html" accesskey="" alt="html" title="html" onclick="insBBCode('html');" />
 &nbsp;&nbsp;&nbsp;&nbsp;
+	</p>
+	<p>
 		<img src="fp-plugins/bbcode/res/toolbaricons/bold.png" id="bb_b" accesskey="" alt="b" title="{$lang.admin.plugin.bbcode.editor.boldtitle}" onclick="insBBCode('b');" />
 		<img src="fp-plugins/bbcode/res/toolbaricons/italic.png" id="bb_i" accesskey="" alt="i" title="{$lang.admin.plugin.bbcode.editor.italictitle}" onclick="insBBCode('i');" />
 		<img src="fp-plugins/bbcode/res/toolbaricons/underlined.png" id="bb_u" accesskey="" alt="u" title="{$lang.admin.plugin.bbcode.editor.underlinetitle}" onclick="insBBCode('u');" />
@@ -30,6 +32,8 @@
 	</p>
 	<p>
 		{$lang.admin.plugin.bbcode.editor.file}{html_options name=attachselect values=$attachs_list output=$attachs_list onchange="insAttach(this.form.attachselect.value)"}&nbsp;
+	</p>
+	<p>
 		{$lang.admin.plugin.bbcode.editor.image}{html_options name=imageselect values=$images_list output=$images_list onchange="insImage(this.form.imageselect.value)"}
 	</p>
 </fieldset>
diff --git a/fp-plugins/gallerycaptions/tpls/admin.plugin.gallerycaptions.tpl b/fp-plugins/gallerycaptions/tpls/admin.plugin.gallerycaptions.tpl
index 8a2b1a7..1bd7650 100644
--- a/fp-plugins/gallerycaptions/tpls/admin.plugin.gallerycaptions.tpl
+++ b/fp-plugins/gallerycaptions/tpls/admin.plugin.gallerycaptions.tpl
@@ -43,7 +43,9 @@
 			</tr>
 		{/foreach}
 		</table>
-		<input type="submit" name="gallerycaptions-savecaptions" value="{$plang.button_savecaptions}"/>
+		<div class="buttonbar">
+			<input type="submit" name="gallerycaptions-savecaptions" value="{$plang.button_savecaptions}"/>
+		</div>
 	{/if}
 	</p>
 	{/html_form}