diff --git a/public/templates/bootstrap/admin/news/default.tpl b/public/templates/bootstrap/admin/news/default.tpl
index e0099943..4d2a9669 100755
--- a/public/templates/bootstrap/admin/news/default.tpl
+++ b/public/templates/bootstrap/admin/news/default.tpl
@@ -26,35 +26,37 @@
                 <label>Content</label>
                 <textarea class="form-control cleditor" name="data[content]" rows="5" required></textarea>
               </div>
-              <input type="submit" value="Add" class="btn btn-outline btn-success btn-lg btn-block">
             </form>
           </div>
         </div>
       </div>
+      <div class="panel-footer">
+        <input type="submit" value="Add" class="btn btn-success">
+      </div>
     </div>
   </div>
 </div>
 <div class="row">
 {nocache}
 {section name=news loop=$NEWS}
-          <div class="col-lg-12">
-            <div class="panel panel-info">
-              <div class="panel-heading">
-                <i class="fa fa-info fa-fw"></i> {$NEWS[news].header}</a>
-                <br />
-                <font size="1px">posted {$NEWS[news].time|date_format:"%b %e, %Y at %H:%M"}{if $HIDEAUTHOR|default:"0" == 0} by <b>{$NEWS[news].author}</b>{/if}</font>
-              </div>
-  
-              <div class="panel-body">
-                {$NEWS[news].content nofilter}
-              </div>
-              <div class="panel-footer">
-                <div  style="text-align:right">
-                  <a href='{$smarty.server.SCRIPT_NAME}?page={$smarty.request.page|escape}&action=news_edit&id={$NEWS[news].id}'><i class="fa fa-wrench fa-fw"></i></a>&nbsp;
-                  <a href='{$smarty.server.SCRIPT_NAME}?page={$smarty.request.page|escape}&action={$smarty.request.action|escape}&do=delete&id={$NEWS[news].id}'><i class="fw fa-trash-o fa-fw"></i></a>
-                </div>
-              </div>
-            </div>
-          </div>
+<div class="col-lg-12">
+  <div class="panel panel-info">
+    <div class="panel-heading">
+      <i class="fa fa-info fa-fw"></i> {$NEWS[news].header}</a>
+      <br />
+      <font size="1px">posted {$NEWS[news].time|date_format:"%b %e, %Y at %H:%M"}{if $HIDEAUTHOR|default:"0" == 0} by <b>{$NEWS[news].author}</b>{/if}</font>
+    </div>
+
+    <div class="panel-body">
+      {$NEWS[news].content nofilter}
+    </div>
+    <div class="panel-footer">
+      <div  style="text-align:right">
+        <a href='{$smarty.server.SCRIPT_NAME}?page={$smarty.request.page|escape}&action=news_edit&id={$NEWS[news].id}'><i class="fa fa-wrench fa-fw"></i></a>&nbsp;
+        <a href='{$smarty.server.SCRIPT_NAME}?page={$smarty.request.page|escape}&action={$smarty.request.action|escape}&do=delete&id={$NEWS[news].id}'><i class="fw fa-trash-o fa-fw"></i></a>
+      </div>
+    </div>
+  </div>
+</div>
 {/section}
 {/nocache}
\ No newline at end of file
diff --git a/public/templates/bootstrap/admin/news_edit/default.tpl b/public/templates/bootstrap/admin/news_edit/default.tpl
old mode 100644
new mode 100755
index 0525e5fd..10a0e8fa
--- a/public/templates/bootstrap/admin/news_edit/default.tpl
+++ b/public/templates/bootstrap/admin/news_edit/default.tpl
@@ -6,7 +6,7 @@
 
 
 <div class="row">
-  <div class="col-lg-12">
+  <form class="col-lg-12" method="POST" action="{$smarty.server.SCRIPT_NAME}" role="form">
     <div class="panel panel-info">
       <div class="panel-heading">
         <i class="fa fa-edit fa-fw"></i> Edit news entry #{$NEWS.id}
@@ -14,7 +14,6 @@
       <div class="panel-body">
         <div class="row">
           <div class="col-lg-12">
-            <form method="POST" action="{$smarty.server.SCRIPT_NAME}" role="form">
               <input type="hidden" name="page" value="{$smarty.request.page|escape}">
               <input type="hidden" name="action" value="{$smarty.request.action|escape}">
               <input type="hidden" name="id" value="{$NEWS.id}">
@@ -36,11 +35,12 @@
                   <th>Content</th>
                   <td><textarea class="cleditor form-control" name="content" rows="15" cols="150" type="text" required>{nocache}{$NEWS.content nofilter}{/nocache}</textarea></td>
               </div>
-              <input type="submit" value="Save" class="btn btn-outline btn-success btn-lg btn-block">
-            </form>
           </div>
         </div>  
       </div>
+      <div class="panel-footer">
+        <input type="submit" value="Save" class="btn btn-success">
+      </div>
     </div>
-  </div>
+  </form>
 </div>