diff --git a/interface/web/admin/templates/language_add.htm b/interface/web/admin/templates/language_add.htm
index e124abf575a2bded82ed2f8ad2b1ae9cbbabef2f..30dc4d153c95a0a18bd2f08615fa5590935a0773 100644
--- a/interface/web/admin/templates/language_add.htm
+++ b/interface/web/admin/templates/language_add.htm
@@ -4,7 +4,6 @@
 <p><tmpl_var name="list_desc_txt"></p>
 
 
-        <legend>Language Add</legend>
             <div class="form-group">
                 <label for="lng_select" class="col-sm-3 control-label">{tmpl_var name='language_select_txt'}</label>
                 <div class="col-sm-9"><select name="lng_select" id="language" class="form-control flags">
@@ -22,4 +21,4 @@
         <div class="clear"><div class="right">
             <button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" data-submit-form="pageForm" data-form-action="admin/language_add.php">{tmpl_var name='btn_save_txt'}</button>
             <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="admin/language_list.php">{tmpl_var name='btn_cancel_txt'}</button>
-        </div></div>
\ No newline at end of file
+        </div></div>
diff --git a/interface/web/admin/templates/language_complete.htm b/interface/web/admin/templates/language_complete.htm
index 5205b285d5a3fae570e76945e21563938bd6987b..53f42fc8fe39734c7190a1349b0d0cf5e7a0a0c6 100644
--- a/interface/web/admin/templates/language_complete.htm
+++ b/interface/web/admin/templates/language_complete.htm
@@ -13,20 +13,18 @@
     </tmpl_if>
 
     <div class="pnl_formsarea">
-        <legend>Language Complete</legend>
-            <div class="form-group">
-                <label for="lng_select" class="col-sm-3 control-label">{tmpl_var name='language_select_txt'}</label>
-                <div class="col-sm-9"><select name="lng_select" id="language" class="form-control flags">
-                    {tmpl_var name='language_option'}
-                </select></div>
+        <div class="form-group">
+             <label for="lng_select" class="col-sm-3 control-label">{tmpl_var name='language_select_txt'}</label>
+            <div class="col-sm-9">
+                <select name="lng_select" id="language" class="form-control flags">{tmpl_var name='language_option'}</select>
             </div>
-			<div class="clear"><div class="right">
-				<button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" data-submit-form="pageForm" data-form-action="admin/language_complete.php">{tmpl_var name='btn_save_txt'}</button>
-				<button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="admin/language_list.php">{tmpl_var name='btn_cancel_txt'}</button>
-			</div></div>
-        
-
-        
+        </div>
+		<div class="clear">
+            <div class="right">
+			    <button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" data-submit-form="pageForm" data-form-action="admin/language_complete.php">{tmpl_var name='btn_save_txt'}</button>
+			    <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="admin/language_list.php">{tmpl_var name='btn_cancel_txt'}</button>
+			</div>
+        </div>       
     </div>
 
-</div>
\ No newline at end of file
+</div>
diff --git a/interface/web/admin/templates/language_edit.htm b/interface/web/admin/templates/language_edit.htm
index d3830494dac7577aed6126206e39dbbc81be6079..c42ebaa51e4bfa8f93f600d4ac749bf0b7eb9606 100644
--- a/interface/web/admin/templates/language_edit.htm
+++ b/interface/web/admin/templates/language_edit.htm
@@ -4,16 +4,20 @@
 <p><tmpl_var name="list_desc_txt"></p>
 
 
-        <fieldset id="wf_area_language_edit"><legend>Language File Edit: {tmpl_var name="file_path"}</legend>
+        <fieldset id="wf_area_language_edit"><legend>{tmpl_var name="lang_file_txt"}: {tmpl_var name="file_path"}</legend>
             <span class="wf_oneField">
                 <tmpl_loop name="records">
                     <span class="wf_oneField">
-                        <label for="records[{tmpl_var name="key"}]" class="wf_preField">{tmpl_var name="key"}</label>
-                        <div class="col-sm-9"><input class="form-control" type="text" id="records[{tmpl_var name="key"}]" name="records[{tmpl_var name="key"}]" value="{tmpl_var name='val'}" ></div></span> 
-                </tmpl_loop>
-            </span>
-        </fieldset>  
-                
+                        <div class="col-sm-9">
+                            <label for="records[{tmpl_var name="key"}]" class="wf_preField">{tmpl_var name="key"}</label>
+                            <input class="form-control" type="text" id="records[{tmpl_var name="key"}]" name="records[{tmpl_var name="key"}]" value="{tmpl_var name='val'}" >
+                        </div>
+                    </span>
+                </tmpl_loop> 
+            </span> 
+        </fieldset>
+
+
         <input type="hidden" name="id" value="{tmpl_var name='id'}">
         <input type="hidden" name="lang" value="{tmpl_var name='lang'}">
         <input type="hidden" name="lang_file" value="{tmpl_var name='lang_file'}">
@@ -22,4 +26,4 @@
         <div class="wf_actions buttons">
             <button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" data-submit-form="pageForm" data-form-action="admin/language_edit.php">{tmpl_var name='btn_save_txt'}</button>
             <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="admin/language_list.php?lng_select={tmpl_var name='lang'}">{tmpl_var name='btn_cancel_txt'}</button>
-        </div>
\ No newline at end of file
+        </div>
diff --git a/interface/web/admin/templates/language_export.htm b/interface/web/admin/templates/language_export.htm
index b00a204b29a470a911e248ca066cf4f1d6024b15..a115e6493a7863228e341d58619e6737a6362ce1 100644
--- a/interface/web/admin/templates/language_export.htm
+++ b/interface/web/admin/templates/language_export.htm
@@ -4,7 +4,6 @@
 <p><tmpl_var name="list_desc_txt"></p>
 
 
-        <legend>Language Export</legend>
             <div class="form-group">
                 <label for="lng_select" class="col-sm-3 control-label">{tmpl_var name='language_select_txt'}</label>
                 <div class="col-sm-9"><select name="lng_select" id="lng_select" class="form-control flags">
diff --git a/interface/web/admin/templates/language_import.htm b/interface/web/admin/templates/language_import.htm
index 8bd653c13e8a33217e830ba187233bd1034c709d..0761cc87ed863f948e889112a4529cd2f9134b64 100644
--- a/interface/web/admin/templates/language_import.htm
+++ b/interface/web/admin/templates/language_import.htm
@@ -4,7 +4,6 @@
 <p><tmpl_var name="list_desc_txt"></p>
 
 
-		<legend>Language Import</legend>
             <div class="form-group">
                 <label for="lng_select" class="col-sm-3 control-label">{tmpl_var name='language_import_txt'}</label>
                 <input name="file" id="file" size="30" type="file" class="fileUpload" />
@@ -31,4 +30,4 @@
             <div class="clear"><div class="right">
                 <button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" data-submit-form="pageForm" data-form-action="admin/language_import.php" data-form-upload="true">{tmpl_var name='btn_save_txt'}</button>
                 <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="admin/language_list.php">{tmpl_var name='btn_cancel_txt'}</button>
-            </div></div>
\ No newline at end of file
+            </div></div>
diff --git a/interface/web/admin/templates/language_list.htm b/interface/web/admin/templates/language_list.htm
index 33897be0a150d4c9137f24bbb0d50657cb7ea02f..0a80e5391c0598b706e66e6a8486761a861ce523 100644
--- a/interface/web/admin/templates/language_list.htm
+++ b/interface/web/admin/templates/language_list.htm
@@ -3,8 +3,6 @@
 </div>
 <p><tmpl_var name="list_desc_txt"></p>
 
-
-        <legend>Tools</legend>
             
                 <div class="form-group">
                     <label for="lng_select" class="col-sm-3 control-label">{tmpl_var name='language_select_txt'}</label>
@@ -43,4 +41,4 @@
             </table>
 </div>
         
-    
\ No newline at end of file
+