diff --git a/admin/menubar.php b/admin/menubar.php
index 17b90607d..67589fddf 100644
--- a/admin/menubar.php
+++ b/admin/menubar.php
@@ -157,6 +157,10 @@ foreach ($mb_conf as $id => $pos )
       )
      );
 }
+
+$action = get_root_url().'admin.php?page=menubar';
+$template->assign(array('F_ACTION'=>$action));
+
 $template->set_filename( 'menubar_admin_content', 'menubar.tpl' );
 $template->assign_var_from_handle( 'ADMIN_CONTENT', 'menubar_admin_content');
 ?>
diff --git a/admin/template/goto/configuration.tpl b/admin/template/goto/configuration.tpl
index 4823c9953..7f8072dfd 100644
--- a/admin/template/goto/configuration.tpl
+++ b/admin/template/goto/configuration.tpl
@@ -6,7 +6,9 @@
   <h2>{'title_configuration'|@translate} {$TABSHEET_TITLE}</h2>
 </div>
 
+{if !isset($default)}
 <form method="post" action="{$F_ACTION}" class="properties">
+{/if}
 
 {if isset($main)}
 <fieldset id="mainConf">
@@ -85,6 +87,7 @@
 
 {if isset($history)}
 <fieldset id="historyConf">
+  <legend></legend>
   <ul>
       <li>
         <label><span class="property">{'conf_history_guest'|@translate}</span><input type="checkbox" name="history_guest" {if ($history.history_guest)}checked="checked"{/if}></label>
@@ -104,6 +107,7 @@
 
 {if isset($comments)}
 <fieldset id="commentsConf">
+  <legend></legend>
   <ul>
     <li>
       <label>
@@ -146,6 +150,7 @@
 
 {if isset($upload)}
 <fieldset id="uploadConf">
+  <legend></legend>
   <ul>
     <li>
       <label><span class="property">{'Show upload link every time'|@translate}</span>
@@ -154,6 +159,7 @@
     <li>
       <label><span class="property">{'User access level to upload'|@translate}</span>
       {html_options name="upload_user_access" options=$upload.upload_user_access_options selected=$upload.upload_user_access_options_selected}
+      </label>
     </li>
     <li>
       <label>
@@ -174,5 +180,5 @@
     <input class="submit" type="submit" name="submit" value="{'Submit'|@translate}" {$TAG_INPUT_ENABLED}>
     <input class="submit" type="reset" name="reset" value="{'Reset'|@translate}">
   </p>
-{/if}
 </form>
+{/if}
diff --git a/admin/template/goto/element_set_unit.tpl b/admin/template/goto/element_set_unit.tpl
index 0520e4e59..391bdb94f 100644
--- a/admin/template/goto/element_set_unit.tpl
+++ b/admin/template/goto/element_set_unit.tpl
@@ -27,7 +27,7 @@
 {if !empty($navbar) }{include file='navigation_bar.tpl'|@get_extent:'navbar'}{/if}
 
 {if !empty($elements) }
-<input type="hidden" name="element_ids" value="{$ELEMENT_IDS}">
+<div><input type="hidden" name="element_ids" value="{$ELEMENT_IDS}"></div>
 {foreach from=$elements item=element}
 <fieldset class="elementEdit">
   <legend>{$element.LEGEND}</legend>
@@ -81,7 +81,7 @@
 
     <tr>
       <td><strong>{'Description'|@translate}</strong></td>
-      <td><textarea name="description-{$element.ID}" id="description-{$element.ID}" class="description">{$element.DESCRIPTION}</textarea></td>
+      <td><textarea cols="50" rows="5" name="description-{$element.ID}" id="description-{$element.ID}" class="description">{$element.DESCRIPTION}</textarea></td>
     </tr>
 
   </table>
diff --git a/admin/template/goto/extend_for_templates.tpl b/admin/template/goto/extend_for_templates.tpl
index 9ed880b63..ad68972c4 100644
--- a/admin/template/goto/extend_for_templates.tpl
+++ b/admin/template/goto/extend_for_templates.tpl
@@ -14,7 +14,7 @@
     {foreach from=$extents item=tpl name=extent_loop}
     <tr class="{if $smarty.foreach.extent_loop.index is odd}row1{else}row2{/if}">
       <td>
-        <input type="hidden" name=reptpl[] value="{$tpl.replacer}">
+        <input type="hidden" name="reptpl[]" value="{$tpl.replacer}">
         {$tpl.replacer}
       </td>
       <td>
diff --git a/admin/template/goto/group_list.tpl b/admin/template/goto/group_list.tpl
index cdd07eb85..9b56dda5b 100644
--- a/admin/template/goto/group_list.tpl
+++ b/admin/template/goto/group_list.tpl
@@ -31,11 +31,11 @@
     <td><a href="{$group.U_MEMBERS}">{$group.MEMBERS}</a></td>
     <td style="text-align:center;">
       <a href="{$group.U_PERM}">
-        <img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/permissions.png" class="button" style="border:none" id="btn_permissions" alt="{'permissions'|@translate}" title="{'permissions'|@translate}"></a>
+        <img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/permissions.png" class="button" style="border:none" alt="{'permissions'|@translate}" title="{'permissions'|@translate}"></a>
       <a href="{$group.U_DELETE}" onclick="return confirm( document.getElementById('btn_delete').title + '\n\n' + '{'Are you sure?'|@translate|@escape:'javascript'}');">
-        <img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/delete.png" class="button" style="border:none" id="btn_delete" alt="{'delete'|@translate}" title="{'delete'|@translate}" {$TAG_INPUT_ENABLED}></a>
+        <img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/delete.png" class="button" style="border:none" alt="{'delete'|@translate}" title="{'delete'|@translate}" {$TAG_INPUT_ENABLED}></a>
       <a href="{$group.U_ISDEFAULT}" onclick="return confirm( document.getElementById('btn_toggle_is_default_group').title + '\n\n' + '{'Are you sure?'|@translate|@escape:'javascript'}');">
-        <img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/toggle_is_default_group.png" class="button" style="border:none" id="btn_toggle_is_default_group" alt="{'toggle_is_default_group'|@translate}" title="{'toggle_is_default_group'|@translate}" {$TAG_INPUT_ENABLED}></a>
+        <img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/toggle_is_default_group.png" class="button" style="border:none" alt="{'toggle_is_default_group'|@translate}" title="{'toggle_is_default_group'|@translate}" {$TAG_INPUT_ENABLED}></a>
     </td>
   </tr>
   {/foreach}
diff --git a/admin/template/goto/menubar.tpl b/admin/template/goto/menubar.tpl
index b03575a85..ca693dfba 100644
--- a/admin/template/goto/menubar.tpl
+++ b/admin/template/goto/menubar.tpl
@@ -4,7 +4,7 @@
 	<h2>Menubar</h2>
 </div>
 
-<form method="post" class="properties">
+<form method="post" action="{$F_ACTION}" class="properties">
 <table class="table2">
 	<tr class="throw">
 		<td>Id</td>
@@ -18,7 +18,7 @@
 		<td>{$block.reg->get_id()}</td>
 		<td>{$block.reg->get_owner()}</td>
 		<td>{$block.reg->get_name()|@translate}</td>
-		<td><input type="input" name="pos_{$block.reg->get_id()}" value={math equation="abs(pos)" pos=$block.pos} size="2"></td>
+		<td><input type="text" name="pos_{$block.reg->get_id()}" value={math equation="abs(pos)" pos=$block.pos} size="2"></td>
 		<td><input type="checkbox" name="hide_{$block.reg->get_id()}" {if $block.pos<0}checked="checked"{/if} ></td>
 	</tr>
 	{/foreach}
diff --git a/admin/template/goto/profile_content.tpl b/admin/template/goto/profile_content.tpl
index e4191f099..22b621567 100644
--- a/admin/template/goto/profile_content.tpl
+++ b/admin/template/goto/profile_content.tpl
@@ -36,8 +36,8 @@
         </span>
         <input type="password" name="passwordConf" id="passwordConf" value="">
       </li>
-    </ul>
 {/if}
+    </ul>
   </fieldset>
 
   <fieldset>