diff --git a/plugins/box/backup/backup.admin.php b/plugins/box/backup/backup.admin.php
index 9c37cc4..7c51c69 100755
--- a/plugins/box/backup/backup.admin.php
+++ b/plugins/box/backup/backup.admin.php
@@ -1,6 +1,11 @@
 <?php
 
+    // Add plugin navigation link
+    Navigation::add(__('Backups', 'backup'), 'system', 'backup', 3);
 
+    /**
+     * Backup Admin Class
+     */
     class BackupAdmin extends Backend {
 
 
diff --git a/plugins/box/backup/backup.plugin.php b/plugins/box/backup/backup.plugin.php
index 8e03513..fafe560 100644
--- a/plugins/box/backup/backup.plugin.php
+++ b/plugins/box/backup/backup.plugin.php
@@ -26,8 +26,6 @@
 
     if (Session::exists('user_role') && in_array(Session::get('user_role'), array('admin'))) {
 
-        Navigation::add(__('Backups', 'backup'), 'system', 'backup', 3);
-
         // Include Backup Admin
         Plugin::admin('backup', 'box');
       
diff --git a/plugins/box/blocks/blocks.admin.php b/plugins/box/blocks/blocks.admin.php
index 27983fc..87ca148 100755
--- a/plugins/box/blocks/blocks.admin.php
+++ b/plugins/box/blocks/blocks.admin.php
@@ -3,9 +3,9 @@
     // Add plugin navigation link
     Navigation::add(__('Blocks', 'blocks'), 'content', 'blocks', 2);
 
-    // Add Plugin Javascript
-    Javascript::add('plugins/box/blocks/js/blocks.js', 'backend');
-
+    /**
+     * Blocks Admin Class
+     */
     class BlocksAdmin extends Backend {
 
 
diff --git a/plugins/box/blocks/blocks.plugin.php b/plugins/box/blocks/blocks.plugin.php
index 46c1333..9895919 100644
--- a/plugins/box/blocks/blocks.plugin.php
+++ b/plugins/box/blocks/blocks.plugin.php
@@ -30,10 +30,15 @@
 
     }
 
+    // Add Plugin Javascript
+    Javascript::add('plugins/box/blocks/js/blocks.js', 'backend');
+
     // Add shortcode {block get="blockname"}
     Shortcode::add('block', 'Block::_content');      
     
-
+    /**
+     * Block Class
+     */
     class Block {
 
 
diff --git a/plugins/box/filesmanager/filesmanager.admin.php b/plugins/box/filesmanager/filesmanager.admin.php
index 817b24c..c20ae51 100755
--- a/plugins/box/filesmanager/filesmanager.admin.php
+++ b/plugins/box/filesmanager/filesmanager.admin.php
@@ -1,9 +1,11 @@
 <?php
 
-
+    // Add plugin navigation link
     Navigation::add(__('Files', 'filesmanager'), 'content', 'filesmanager', 3);
 
-    
+    /**
+     * Filesmanager Admin Class
+     */
     class FilesmanagerAdmin extends Backend {
         
         /**
diff --git a/plugins/box/information/information.admin.php b/plugins/box/information/information.admin.php
index 1f6881b..a2a8018 100644
--- a/plugins/box/information/information.admin.php
+++ b/plugins/box/information/information.admin.php
@@ -1,9 +1,11 @@
 <?php
 
-
+    // Add plugin navigation link
     Navigation::add(__('Information', 'information'), 'system', 'information', 5);
 
-    
+    /**
+     * Information Admin Class
+     */
     class InformationAdmin extends Backend {
 
 
diff --git a/plugins/box/menu/menu.admin.php b/plugins/box/menu/menu.admin.php
index ac97225..cb1e67b 100644
--- a/plugins/box/menu/menu.admin.php
+++ b/plugins/box/menu/menu.admin.php
@@ -3,10 +3,9 @@
     // Add plugin navigation link
     Navigation::add(__('Menu', 'menu'), 'content', 'menu', 4);
 
-    // Add Plugin Javascript
-    Javascript::add('plugins/box/menu/js/menu.js', 'backend');
-
-
+    /**
+     * Menu Admin Class
+     */
     class MenuAdmin extends Backend {
 
 
diff --git a/plugins/box/menu/menu.plugin.php b/plugins/box/menu/menu.plugin.php
index 335bb18..f7db6c0 100644
--- a/plugins/box/menu/menu.plugin.php
+++ b/plugins/box/menu/menu.plugin.php
@@ -31,6 +31,13 @@
     }
 
 
+    // Add Plugin Javascript
+    Javascript::add('plugins/box/menu/js/menu.js', 'backend');
+
+
+    /**
+     * Menu Class
+     */
     class Menu {
         
 
diff --git a/plugins/box/pages/pages.admin.php b/plugins/box/pages/pages.admin.php
index 83ffc1d..7612a8e 100755
--- a/plugins/box/pages/pages.admin.php
+++ b/plugins/box/pages/pages.admin.php
@@ -1,14 +1,14 @@
 <?php
 
+    // Add plugin navigation link
     Navigation::add(__('Pages', 'pages'), 'content', 'pages', 1);
     
-
+    // Add action on admin_pre_render hook
     Action::add('admin_pre_render','PagesAdmin::_pageExpandAjax');
 
-    // Add Plugin Javascript
-    Javascript::add('plugins/box/pages/js/pages.js', 'backend');
-
-
+    /**
+     * Pages Admin Class
+     */
     class PagesAdmin extends Backend {
 
 
diff --git a/plugins/box/pages/pages.plugin.php b/plugins/box/pages/pages.plugin.php
index af16b29..b39e6bc 100644
--- a/plugins/box/pages/pages.plugin.php
+++ b/plugins/box/pages/pages.plugin.php
@@ -32,6 +32,12 @@
     }
 
 
+    // Add Plugin Javascript
+    Javascript::add('plugins/box/pages/js/pages.js', 'backend');
+
+    /**
+     * Pages Class
+     */
     class Pages extends Frontend { 
 
 
diff --git a/plugins/box/plugins/plugins.admin.php b/plugins/box/plugins/plugins.admin.php
index 180e1ca..a68c518 100755
--- a/plugins/box/plugins/plugins.admin.php
+++ b/plugins/box/plugins/plugins.admin.php
@@ -3,6 +3,9 @@
     // Add plugin navigation link
     Navigation::add(__('Plugins', 'plugins'), 'extends', 'plugins', 1);
 
+    /**
+     * Plugins Admin
+     */
     class PluginsAdmin extends Backend {
 
         /**
diff --git a/plugins/box/sitemap/sitemap.plugin.php b/plugins/box/sitemap/sitemap.plugin.php
index 4747dbe..faaa0ae 100644
--- a/plugins/box/sitemap/sitemap.plugin.php
+++ b/plugins/box/sitemap/sitemap.plugin.php
@@ -30,7 +30,7 @@
 
 
     /**
-     * Sitemap 
+     * Sitemap class
      */
     class Sitemap extends Frontend {
 
diff --git a/plugins/box/snippets/snippets.admin.php b/plugins/box/snippets/snippets.admin.php
index c933af6..a94149d 100755
--- a/plugins/box/snippets/snippets.admin.php
+++ b/plugins/box/snippets/snippets.admin.php
@@ -3,10 +3,9 @@
     // Add plugin navigation link
     Navigation::add(__('Snippets', 'snippets'), 'extends', 'snippets', 3);
 
-    // Add Plugin Javascript
-    Javascript::add('plugins/box/snippets/js/snippets.js', 'backend');
-
-
+    /**
+     * Snippets Admin Class
+     */
     class SnippetsAdmin extends Backend {
 
         /**
diff --git a/plugins/box/snippets/snippets.plugin.php b/plugins/box/snippets/snippets.plugin.php
index 7f9edb2..78f7cee 100644
--- a/plugins/box/snippets/snippets.plugin.php
+++ b/plugins/box/snippets/snippets.plugin.php
@@ -30,6 +30,9 @@
 
     }
 
+    // Add Plugin Javascript
+    Javascript::add('plugins/box/snippets/js/snippets.js', 'backend');
+
     // Add shortcode {snippet}
     Shortcode::add('snippet', 'Snippet::_content');      
     
diff --git a/plugins/box/system/system.admin.php b/plugins/box/system/system.admin.php
index 42f809c..ea05fe0 100755
--- a/plugins/box/system/system.admin.php
+++ b/plugins/box/system/system.admin.php
@@ -25,6 +25,9 @@
         '); 
     }
 
+    /**
+     * System Admin
+     */
     class SystemAdmin extends Backend {
         
         
diff --git a/plugins/box/themes/themes.admin.php b/plugins/box/themes/themes.admin.php
index 17c8cd4..564102f 100755
--- a/plugins/box/themes/themes.admin.php
+++ b/plugins/box/themes/themes.admin.php
@@ -1,8 +1,11 @@
 <?php
 
+    // Add plugin navigation link
     Navigation::add(__('Themes', 'themes'), 'extends', 'themes', 2);
 
-
+    /**
+     * Themes Admin Class
+     */
     class ThemesAdmin extends Backend {
 
 
diff --git a/plugins/box/themes/themes.plugin.php b/plugins/box/themes/themes.plugin.php
index 7fb564c..7ad30b8 100644
--- a/plugins/box/themes/themes.plugin.php
+++ b/plugins/box/themes/themes.plugin.php
@@ -30,7 +30,9 @@
 
     }
 
-
+    /**
+     * Themes Class
+     */
     class Themes {
         
 
diff --git a/plugins/box/users/users.admin.php b/plugins/box/users/users.admin.php
index fe5f73b..c7217d4 100755
--- a/plugins/box/users/users.admin.php
+++ b/plugins/box/users/users.admin.php
@@ -12,10 +12,9 @@
     // Add plugin navigation link
     Navigation::add(__('Users', 'users'), 'system', 'users', 2);
 
-    // Add Plugin Javascript
-    Javascript::add('plugins/box/users/js/users.js', 'backend');
-    
-    
+    /**
+     * Users Admin Class
+     */    
     class UsersAdmin extends Backend {
 
         /**
diff --git a/plugins/box/users/users.plugin.php b/plugins/box/users/users.plugin.php
index daf9f9e..5064c41 100644
--- a/plugins/box/users/users.plugin.php
+++ b/plugins/box/users/users.plugin.php
@@ -25,6 +25,8 @@
     // Include Users Admin
     Plugin::Admin('users', 'box');
 
+    // Add Plugin Javascript
+    Javascript::add('plugins/box/users/js/users.js', 'backend');
 
     /**
      * Users class
diff --git a/plugins/markitup/markitup.plugin.php b/plugins/markitup/markitup.plugin.php
index ea3322b..aeb7763 100644
--- a/plugins/markitup/markitup.plugin.php
+++ b/plugins/markitup/markitup.plugin.php
@@ -24,7 +24,9 @@
     // Add hooks  
     Action::add('admin_header', 'MarkItUp::headers');
 
-
+    /**
+     * MarkItUp Class
+     */
     class MarkItUp {
                 
 
diff --git a/plugins/sandbox/sandbox.plugin.php b/plugins/sandbox/sandbox.plugin.php
index 17745e3..d2a8f6f 100644
--- a/plugins/sandbox/sandbox.plugin.php
+++ b/plugins/sandbox/sandbox.plugin.php
@@ -31,7 +31,7 @@
 
 
     /**
-     * Sandbox simple class
+     * Sandbox class
      */
     class Sandbox extends Frontend {