diff --git a/admin/panels/entry/admin.entry.write.tpl b/admin/panels/entry/admin.entry.write.tpl
index 6ee3008..9be96e5 100755
--- a/admin/panels/entry/admin.entry.write.tpl
+++ b/admin/panels/entry/admin.entry.write.tpl
@@ -71,7 +71,6 @@
 						{/literal}
 						{/if}
 						{*here will go a plugin hook*}
-						{action hook=simple_edit_form}
 						</p>
 					</div>
                 </div>
@@ -120,6 +119,15 @@
 						</ul>
 				 	</p>
               </div>
+			<div class="card shadow mb-4 plugin_options">
+				<div class="card-header">
+				  <h6 class="m-0 font-weight-bold text-primary">Plugins Options</h6>
+				</div>
+				<div class="m-4">
+					{toolbar}
+					{action hook=simple_edit_form}
+				</div>
+			 </div>
             </div>
           </div>
 		
diff --git a/admin/panels/main/admin.main.tpl b/admin/panels/main/admin.main.tpl
index b6e4e91..72e9845 100755
--- a/admin/panels/main/admin.main.tpl
+++ b/admin/panels/main/admin.main.tpl
@@ -36,14 +36,19 @@
 			</div>
 	</div>
 	<div class="col-lg-6 mb-4">
-		<div class="card shadow mb-4">
-		<div class="card-header">
-			<h6 class="m-0 font-weight-bold text-primary">{$panelstrings.last_comments}</h6>
-		</div>
-		<div class="card-body lc_table">
-			{$last_comments_table}
-		</div>
-		</div>
+		
+			<div class="card shadow mb-4">
+			<div class="card-header">
+				<h6 class="m-0 font-weight-bold text-primary">{$panelstrings.last_comments}</h6>
+			</div>
+			<div class="card-body lc_table">
+				{if $last_comments_table}
+					{$last_comments_table}
+				{else}
+					<h2 class="text-center font-italic">No comments yet :(</h2>
+				{/if}
+			</div>
+			</div>
 	</div>
 </div>
 <div class="row">
diff --git a/admin/panels/static/admin.static.write.tpl b/admin/panels/static/admin.static.write.tpl
index 0087b0e..2d5e0e6 100755
--- a/admin/panels/static/admin.static.write.tpl
+++ b/admin/panels/static/admin.static.write.tpl
@@ -82,6 +82,16 @@
 					</fieldset>
                 </div>
               </div>
+			  <div class="card shadow mb-4 plugin_options">
+				<div class="card-header">
+				  <h6 class="m-0 font-weight-bold text-primary">Plugins Options</h6>
+				</div>
+				<div class="m-4">
+					{toolbar}
+					<!-- {action hook=simple_edit_form} (Only writting an entry) -->
+				</div>
+			  </div>
+            </div>
             </div>
 		</div>