diff --git a/menu/bot/bot.js b/menu/bot/bot.js
index 3ffdd56..45e5d48 100644
--- a/menu/bot/bot.js
+++ b/menu/bot/bot.js
@@ -1,17 +1,31 @@
-//--------------------------------------------Modules--------------------------------------------//
+//---------------------------------------------------------------------//
+// Modules
+//
+// This is where you put the NPM Modules to use in this file.
+//---------------------------------------------------------------------//
+
 var path = require('path');
 var fse = require('fs-extra');
-const { exec } = require('child_process');
-
+var {exec} = require('child_process');
 var $ = jQuery = require('jquery');
-//-----------------------------------------------------------------------------------------------//
-
 
+//---------------------------------------------------------------------//
+// JSON OBJ
+//
+// Use these JSON objects that contain the App Data.
+// obj -> data.json
+// obj_bot -> bot_data.json
+//---------------------------------------------------------------------//
 
 var obj = JSON.parse(fse.readFileSync(dataDataPath, 'utf8'));
 var obj_bot = JSON.parse(fse.readFileSync(BotDataPath, 'utf8'));
 
-// Load values
+//---------------------------------------------------------------------//
+// Load Values
+//
+// Loads values from JSON files.
+//---------------------------------------------------------------------//
+
 $('#BotBackupSelect').val(obj_bot.Backup_Timer_Type);
 $('#BotBackupAmount').val(obj_bot.Backup_Timer_Value);
 
@@ -19,62 +33,102 @@ if($('#BotBackupSelect').val() == 1) {
     $('#BotBackupAmount').prop('disabled', true);
 }
 
-function BotStartClick() {
-    // Check if Bot Path exists and is valid
+//---------------------------------------------------------------------//
+// function BotConsoleLog(text)
+//
+// This function sends text to Bot Console Log.
+//---------------------------------------------------------------------//
+
+function BotConsoleLog(text) {
+    $('#BotConsoleLog').append(text);
+    if(!$('#BotConsoleLog').is(':visible')) {
+        $('#BotConsoleLogNumber').html(parseInt($('#BotConsoleLogNumber').text(),10) + 1 || 1)
+    }
+}
+
+//---------------------------------------------------------------------//
+// function CheckIfDBMPathExists()
+//
+// This function checks if DBM Path exists and is valid.
+//---------------------------------------------------------------------//
+
+function CheckIfDBMPathExists() {
+    if(obj.DBM_Path == "") {
+        BotConsoleLog(`${new Date().toTimeString().slice(0,8)} - ERROR: DBM Path isn't set in Settings\n`);
+        return;
+    }
+
+    if(!fse.existsSync(obj.DBM_Path)) {
+        BotConsoleLog(`${new Date().toTimeString().slice(0,8)} - ERROR: DBM Path isn't valid\n`);
+        return;
+    }
+}
+
+//---------------------------------------------------------------------//
+// function CheckIfBotPathExists()
+//
+// This function checks if Bot Path exists and is valid.
+//---------------------------------------------------------------------//
+
+function CheckIfBotPathExists() {
     if(obj.Bot_Path == "") {
-        $('#BotConsoleLog').append(`${new Date().toTimeString().slice(0,8)} - ERROR: Bot Path isn't set in Settings\n`);
+        BotConsoleLog(`${new Date().toTimeString().slice(0,8)} - ERROR: Bot Path isn't set in Settings\n`);
         return;
     }
 
     if(!fse.existsSync(obj.Bot_Path)) {
-        $('#BotConsoleLog').append(`${new Date().toTimeString().slice(0,8)} - ERROR: Bot Path isn't valid\n`);
+        BotConsoleLog(`${new Date().toTimeString().slice(0,8)} - ERROR: Bot Path isn't valid\n`);
         return;
     }
+}
+
+//---------------------------------------------------------------------//
+// function BotStartClick()
+//
+// This is the function that starts your bot when you
+// press the Start button on Bot tab.
+//---------------------------------------------------------------------//
+
+function BotStartClick() {
+    //-----------------------------Check if Bot Path exists and is valid-----------------------------//
+    CheckIfBotPathExists();
     //-----------------------------------------------------------------------------------------------//
 
+
     const grep = process.platform === "win32" ? exec(`start cmd.exe /k "cd "${obj.Bot_Path}" && node bot.js"`) : exec(`gnome-terminal --command="bash -c 'cd ${(obj.Bot_Path).replace(/\ /g, "\\ ")}; node bot.js; ls; $SHELL'"`);
-    $('#BotConsoleLog').append(`${new Date().toTimeString().slice(0,8)} - Bot Started\n`);
+    BotConsoleLog(`${new Date().toTimeString().slice(0,8)} - Bot Started\n`);
 
     if(process.platform === "win32") { // Linux doesn't detect this...
         grep.on('close', (code, signal) => {
-            $('#BotConsoleLog').append(`${new Date().toTimeString().slice(0,8)} - Bot Stopped\n`);
+            BotConsoleLog(`${new Date().toTimeString().slice(0,8)} - Bot Stopped\n`);
         });
     }
 
     grep.on('error', (err) => {
-        $('#BotConsoleLog').append(`${new Date().toTimeString().slice(0,8)} - ERROR: ${err}\n`);
+        BotConsoleLog(`${new Date().toTimeString().slice(0,8)} - ERROR: ${err}\n`);
     });
 }
 
+//---------------------------------------------------------------------//
+// function BotCopyActionsClick()
+//
+// This is the function that copies and pastes your actions folder
+// on your bot folder when you press the Copy DBM Actions Folder 
+// button on Bot tab.
+//---------------------------------------------------------------------//
+
 function BotCopyActionsClick() {
     const start = new Date();
     var processB1 = 0;
 
-    $('#BotConsoleLog').append(`${new Date().toTimeString().slice(0,8)} - Copying and pasting DBM Actions Folder...\n`);
+    BotConsoleLog(`${new Date().toTimeString().slice(0,8)} - Copying and pasting DBM Actions Folder...\n`);
 
-    // Check if DBM Path exists and is valid
-    if(obj.DBM_Path == "") {
-        $('#BotConsoleLog').append(`${new Date().toTimeString().slice(0,8)} - ERROR: DBM Path isn't set in Settings\n`);
-        return;
-    }
 
-    if(!fse.existsSync(obj.DBM_Path)) {
-        $('#BotConsoleLog').append(`${new Date().toTimeString().slice(0,8)} - ERROR: DBM Path isn't valid\n`);
-        return;
-    }
+    //------------------------Check if DBM Path and Bot Path exists and is valid---------------------//
+    CheckIfDBMPathExists();
+    CheckIfBotPathExists();
     //-----------------------------------------------------------------------------------------------//
 
-    // Check if Bot Path exists and is valid
-    if(obj.Bot_Path == "") {
-        $('#BotConsoleLog').append(`${new Date().toTimeString().slice(0,8)} - ERROR: Bot Path isn't set in Settings\n`);
-        return;
-    }
-
-    if(!fse.existsSync(obj.Bot_Path)) {
-        $('#BotConsoleLog').append(`${new Date().toTimeString().slice(0,8)} - ERROR: Bot Path isn't valid\n`);
-        return;
-    }
-    //-----------------------------------------------------------------------------------------------//
 
     fse.readdirSync(path.join(obj.DBM_Path, "actions")).forEach(function(file, index, arr) {
         if(file.match(/^.+\.js$/i)) {
@@ -83,12 +137,20 @@ function BotCopyActionsClick() {
         }
         processB1++;
         if(processB1 === arr.length) {
-            $('#BotConsoleLog').append(`${new Date().toTimeString().slice(0,8)} - DBM Actions Folder copied and pasted in your Bot successfully! (${((new Date() - start)*10**-3).toFixed(3)}s)\n`);
+            BotConsoleLog(`${new Date().toTimeString().slice(0,8)} - DBM Actions Folder copied and pasted in your Bot successfully! (${((new Date() - start)*10**-3).toFixed(3)}s)\n`);
         }
     });
 }
 
-BotBackupSelectOnChange();
+//---------------------------------------------------------------------//
+// function BotBackupSelectOnChange()
+//
+// This is the function that makes the backup data folder system
+// work.
+//---------------------------------------------------------------------//
+
+BotBackupSelectOnChange(); //Executes the function BotBackupSelectOnChange() on start of the app
+
 function BotBackupSelectOnChange() {
     const BackupSelectValue =  $("#BotBackupSelect").val();
     let timesetBackup = null;
@@ -112,16 +174,8 @@ function BotBackupSelectOnChange() {
 
     if (!isNaN(BackupSelectValue) && timesetBackup != null) {
         this.currentInterval = setInterval(function() {
-            // Check if Bot Path exists and is valid
-            if(obj.Bot_Path == "") {
-                $('#BotConsoleLog').append(`${new Date().toTimeString().slice(0,8)} - ERROR: Bot Path isn't set in Settings\n`);
-                return;
-            }
-
-            if(!fse.existsSync(obj.Bot_Path)) {
-                $('#BotConsoleLog').append(`${new Date().toTimeString().slice(0,8)} - ERROR: Bot Path isn't valid\n`);
-                return;
-            }
+            //-----------------------------Check if Bot Path exists and is valid-----------------------------//
+            CheckIfBotPathExists();
             //-----------------------------------------------------------------------------------------------//
 
             const d = new Date();
@@ -129,12 +183,13 @@ function BotBackupSelectOnChange() {
             fse.ensureDirSync(path.join(BackupsPath, fname));
             fse.copySync(path.join(obj.Bot_Path, "data"), path.join(BackupsPath, fname));
 
-            $('#BotConsoleLog').append(`${d.toTimeString().slice(0,8)} - New backup folder created: ${fname}\n`);
+            BotConsoleLog(`${d.toTimeString().slice(0,8)} - New backup folder created: ${fname}\n`);
     }, timesetBackup);
 };
 
-// Store value in Data
+//------------------------------------Store value in Data----------------------------------------//
 obj_bot.Backup_Timer_Value = $("#BotBackupAmount").val();
 obj_bot.Backup_Timer_Type = BackupSelectValue;
 fse.writeFileSync(BotDataPath, JSON.stringify(obj_bot));
+//-----------------------------------------------------------------------------------------------//
 }
\ No newline at end of file
diff --git a/menu/menu/menu.ejs b/menu/menu/menu.ejs
index fbd9856..e523bbe 100644
--- a/menu/menu/menu.ejs
+++ b/menu/menu/menu.ejs
@@ -6,7 +6,7 @@
     <% include ../../menu/sidebar/sidebar %>
 </div>
 
-<div style="margin-left: 250px;">
+<div id="MenuAllWindows" style="margin-left: 250px;">
     <div id="ModsWindow"> <!-- Mods Stuff -->
     <% include ../../menu/mods/mods %>
     </div>
diff --git a/menu/menu/menu.js b/menu/menu/menu.js
index 5c68262..3dfea33 100644
--- a/menu/menu/menu.js
+++ b/menu/menu/menu.js
@@ -1,35 +1,44 @@
-//--------------------------------------------Modules--------------------------------------------//
-//var electron = require('electron');
+//---------------------------------------------------------------------//
+// Modules
+//
+// This is where you put the NPM Modules to use in this file.
+//---------------------------------------------------------------------//
+
 var path = require('path');
-//var ejs = require('ejs-electron');
 var fse = require('fs-extra');
-//const { exec } = require('child_process');
-//const {ipcRenderer} = electron;
-
 var $ = jQuery = require('jquery');
-//-----------------------------------------------------------------------------------------------//
 
+//---------------------------------------------------------------------//
+// Check If Backups Folder Exists
+//
+// This checks if the Backups folder exists.
+// If not, creates one.
+//---------------------------------------------------------------------//
 
-
-// Check if backups folder exists----------------------------------------------------------------//
 var BackupsPath = path.join(require('electron').remote.app.getPath('userData'), "backups");
 if(fse.existsSync(BackupsPath) == false) {
     fse.mkdirSync(BackupsPath);
 }
-//-----------------------------------------------------------------------------------------------//
-
 
+//---------------------------------------------------------------------//
+// Check If Data Folder Exists
+//
+// This checks if the data folder exists.
+// If not, creates one.
+//---------------------------------------------------------------------//
 
-// Check if data folder exists-------------------------------------------------------------------//
 var DataPath = path.join(require('electron').remote.app.getPath('userData'), "data");
 if(fse.existsSync(DataPath) == false) {
     fse.mkdirSync(DataPath);
 }
-//-----------------------------------------------------------------------------------------------//
 
+//---------------------------------------------------------------------//
+// Check If bot_data.json Exists
+//
+// This checks if the bot_data.json file exists.
+// If not, creates one.
+//---------------------------------------------------------------------//
 
-
-// Check if bot_data.json exists-----------------------------------------------------------------//
 var BotDataPath = path.join(DataPath, "bot_data.json");
 if(fse.existsSync(BotDataPath) == false) {
     const obj_bot = JSON.stringify({
@@ -38,11 +47,14 @@ if(fse.existsSync(BotDataPath) == false) {
     });
     fse.writeFileSync(BotDataPath, obj_bot);
 }
-//-----------------------------------------------------------------------------------------------//
-
 
+//---------------------------------------------------------------------//
+// Check If mods_data.json Exists
+//
+// This checks if the mods_data.json file exists.
+// If not, creates one.
+//---------------------------------------------------------------------//
 
-// Check if mods_data.json exists----------------------------------------------------------------//
 var ModsDataPath = path.join(DataPath, "mods_data.json");
 if(fse.existsSync(ModsDataPath) == false) {
     const obj_mods = JSON.stringify({
@@ -50,11 +62,14 @@ if(fse.existsSync(ModsDataPath) == false) {
     });
     fse.writeFileSync(ModsDataPath, obj_mods);
 }
-//-----------------------------------------------------------------------------------------------//
 
+//---------------------------------------------------------------------//
+// Check If data.json Exists
+//
+// This checks if the data.json file exists.
+// If not, creates one.
+//---------------------------------------------------------------------//
 
-
-// Check if data.json exists---------------------------------------------------------------------//
 var dataDataPath = path.join(DataPath, "data.json");
 if(fse.existsSync(dataDataPath) == false) {
     const obj = JSON.stringify({
@@ -63,5 +78,4 @@ if(fse.existsSync(dataDataPath) == false) {
         "Discord_RPC": true
     });
     fse.writeFileSync(dataDataPath, obj);
-}
-//-----------------------------------------------------------------------------------------------//
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/menu/mods/mods.js b/menu/mods/mods.js
index 1d27788..ff3e3fd 100644
--- a/menu/mods/mods.js
+++ b/menu/mods/mods.js
@@ -1,43 +1,86 @@
-//--------------------------------------------Modules--------------------------------------------//
+//---------------------------------------------------------------------//
+// Modules
+//
+// This is where you put the NPM Modules to use in this file.
+//---------------------------------------------------------------------//
+
 var path = require('path');
 var fse = require('fs-extra');
-
+var repo = require('github-download-parts');
 var $ = jQuery = require('jquery');
-//-----------------------------------------------------------------------------------------------//
-
 
+//---------------------------------------------------------------------//
+// JSON OBJ
+//
+// Use these JSON objects that contain the App Data.
+// obj -> data.json
+// obj_mods -> mods_data.json
+//---------------------------------------------------------------------//
 
 var obj = JSON.parse(fse.readFileSync(dataDataPath, 'utf8'));
 var obj_mods = JSON.parse(fse.readFileSync(ModsDataPath, 'utf8'));
 
-// Load values
-$('#ModsAM').prop('checked', obj_mods.Alternative_Mods);
-
-function ModsInstallClick() {
-    const repo = require('github-download-parts');
+//---------------------------------------------------------------------//
+// Load Values
+//
+// Loads values from JSON files.
+//---------------------------------------------------------------------//
 
-    const e = document.getElementById("ModsBranchSelect");
-    const branch = e.options[e.selectedIndex].value;
+$('#ModsAM').prop('checked', obj_mods.Alternative_Mods);
 
-    const alternativeM = $('#ModsAM').prop('checked');
+//---------------------------------------------------------------------//
+// function ModsConsoleLog(text)
+//
+// This function sends text to Mods Console Log.
+//---------------------------------------------------------------------//
 
-    const start = new Date();
-    $('#ModsConsoleLog').append(`${new Date().toTimeString().slice(0,8)} - Installing DBM Mods${alternativeM == true ? " and Alternative Mods" : ""} [${$('#ModsBranchSelect option:selected').text()}]...\n`);
-    $('.Dbutton_BlockStuff').prop('disabled', true);
+function ModsConsoleLog(text) {
+    $('#ModsConsoleLog').append(text);
+    if(!$('#ModsConsoleLog').is(':visible')) {
+        $('#ModsConsoleLogNumber').html(parseInt($('#ModsConsoleLogNumber').text(),10) + 1 || 1)
+    }
+}
 
+//---------------------------------------------------------------------//
+// function CheckIfDBMPathExists()
+//
+// This function checks if DBM Path exists and is valid.
+//---------------------------------------------------------------------//
 
-    // Check if DBM Path exists and is valid
+function CheckIfDBMPathExists() {
     if(obj.DBM_Path == "") {
-        $('#ModsConsoleLog').append(`${new Date().toTimeString().slice(0,8)} - ERROR: DBM Path isn't set in Settings\n`);
+        ModsConsoleLog(`${new Date().toTimeString().slice(0,8)} - ERROR: DBM Path isn't set in Settings\n`);
         $('.Dbutton_BlockStuff').prop('disabled', false);
         return;
     }
 
     if(!fse.existsSync(obj.DBM_Path)) {
-        $('#ModsConsoleLog').append(`${new Date().toTimeString().slice(0,8)} - ERROR: DBM Path isn't valid\n`);
+        ModsConsoleLog(`${new Date().toTimeString().slice(0,8)} - ERROR: DBM Path isn't valid\n`);
         $('.Dbutton_BlockStuff').prop('disabled', false);
         return;
     }
+}
+
+//---------------------------------------------------------------------//
+// function ModsInstallClick()
+//
+// This is the function that installs the DBM Mods when you
+// press the Install button on Mods tab.
+//---------------------------------------------------------------------//
+
+function ModsInstallClick() {
+    const e = document.getElementById("ModsBranchSelect");
+    const branch = e.options[e.selectedIndex].value;
+
+    const alternativeM = $('#ModsAM').prop('checked');
+
+    const start = new Date();
+    ModsConsoleLog(`${new Date().toTimeString().slice(0,8)} - Installing DBM Mods${alternativeM == true ? " and Alternative Mods" : ""} [${$('#ModsBranchSelect option:selected').text()}]...\n`);
+    $('.Dbutton_BlockStuff').prop('disabled', true);
+
+
+    //-----------------------------Check if DBM Path exists and is valid-----------------------------//
+    CheckIfDBMPathExists();
     //-----------------------------------------------------------------------------------------------//
 
 
@@ -46,43 +89,42 @@ function ModsInstallClick() {
         if(alternativeM == true) {
             repo({repo: "Discord-Bot-Maker-Mods/DBM-Mods", branch: branch}, path.join(obj.DBM_Path, "actions"), 'AlternativeMods')
             .then(() => {
-                $('#ModsConsoleLog').append(`${new Date().toTimeString().slice(0,8)} - DBM Mods and Alternative Mods installed successfully! (${((new Date() - start)*10**-3).toFixed(3)}s)\n`);
+                ModsConsoleLog(`${new Date().toTimeString().slice(0,8)} - DBM Mods and Alternative Mods installed successfully! (${((new Date() - start)*10**-3).toFixed(3)}s)\n`);
                 $('.Dbutton_BlockStuff').prop('disabled', false);
             })
             .catch((err) => {
-                $('#ModsConsoleLog').append(`${new Date().toTimeString().slice(0,8)} - ERROR: ${err}\n`);
+                ModsConsoleLog(`${new Date().toTimeString().slice(0,8)} - ERROR: ${err}\n`);
                 $('.Dbutton_BlockStuff').prop('disabled', false);
             });
         } else {
-            $('#ModsConsoleLog').append(`${new Date().toTimeString().slice(0,8)} - DBM Mods installed successfully! (${((new Date() - start)*10**-3).toFixed(3)}s)\n`);
+            ModsConsoleLog(`${new Date().toTimeString().slice(0,8)} - DBM Mods installed successfully! (${((new Date() - start)*10**-3).toFixed(3)}s)\n`);
             $('.Dbutton_BlockStuff').prop('disabled', false);
         }
     })
     .catch((err) => {
-        $('#ModsConsoleLog').append(`${new Date().toTimeString().slice(0,8)} - ERROR: ${err}\n`);
+        ModsConsoleLog(`${new Date().toTimeString().slice(0,8)} - ERROR: ${err}\n`);
         $('.Dbutton_BlockStuff').prop('disabled', false);
     });
 }
 
+//---------------------------------------------------------------------//
+// function ModsUninstallClick()
+//
+// This is the function that uninstalls the DBM Mods when you
+// press the Uninstall button on Mods tab.
+//---------------------------------------------------------------------//
+
 function ModsUninstallClick() {
     const start = new Date();
-    $('#ModsConsoleLog').append(`${new Date().toTimeString().slice(0,8)} - Uninstalling DBM Mods...\n`);
+    ModsConsoleLog(`${new Date().toTimeString().slice(0,8)} - Uninstalling DBM Mods...\n`);
     $('.Dbutton_BlockStuff').prop('disabled', true);
 
-    // Check if DBM Path exists and is valid
-    if(obj.DBM_Path == "") {
-        $('#ModsConsoleLog').append(`${new Date().toTimeString().slice(0,8)} - ERROR: DBM Path isn't set in Settings\n`);
-        $('.Dbutton_BlockStuff').prop('disabled', false);
-        return;
-    }
 
-    if(!fse.existsSync(obj.DBM_Path)) {
-        $('#ModsConsoleLog').append(`${new Date().toTimeString().slice(0,8)} - ERROR: DBM Path isn't valid\n`);
-        $('.Dbutton_BlockStuff').prop('disabled', false);
-        return;
-    }
+    //-----------------------------Check if DBM Path exists and is valid-----------------------------//
+    CheckIfDBMPathExists();
     //-----------------------------------------------------------------------------------------------//
 
+
     var processM1 = 0;
     var processM2 = 0;
 
@@ -93,12 +135,19 @@ function ModsUninstallClick() {
         }
         processM1++;
         if(processM1 === arr.length) {
-            $('#ModsConsoleLog').append(`${new Date().toTimeString().slice(0,8)} - ${processM2} ${processM2 === 1 ? 'mod' : 'mods'} uninstalled successfully! (${((new Date() - start)*10**-3).toFixed(3)}s)\n`);
+            ModsConsoleLog(`${new Date().toTimeString().slice(0,8)} - ${processM2} ${processM2 === 1 ? 'mod' : 'mods'} uninstalled successfully! (${((new Date() - start)*10**-3).toFixed(3)}s)\n`);
             $('.Dbutton_BlockStuff').prop('disabled', false);
         }
     });
 }
 
+//---------------------------------------------------------------------//
+// function ModsAMClick()
+//
+// This function store value from Switch about Install Alternative
+// Mods on Mods Tab.
+//---------------------------------------------------------------------//
+
 function ModsAMClick() {
     obj_mods.Alternative_Mods = $('#ModsAM').prop('checked');
     fse.writeFileSync(ModsDataPath, JSON.stringify(obj_mods));
diff --git a/menu/settings/settings.js b/menu/settings/settings.js
index c7fea02..ae96fa6 100644
--- a/menu/settings/settings.js
+++ b/menu/settings/settings.js
@@ -1,18 +1,37 @@
-//--------------------------------------------Modules--------------------------------------------//
-var fse = require('fs-extra');
+//---------------------------------------------------------------------//
+// Modules
+//
+// This is where you put the NPM Modules to use in this file.
+//---------------------------------------------------------------------//
 
+var fse = require('fs-extra');
 var $ = jQuery = require('jquery');
-//-----------------------------------------------------------------------------------------------//
-
 
+//---------------------------------------------------------------------//
+// JSON OBJ
+//
+// Use these JSON objects that contain the App Data.
+// obj -> data.json
+//---------------------------------------------------------------------//
 
 var obj = JSON.parse(fse.readFileSync(dataDataPath, 'utf8'));
 
-// Define the values
+//---------------------------------------------------------------------//
+// Load Values
+//
+// Loads values from JSON files.
+//---------------------------------------------------------------------//
+
 $('#SettingsDBMPath').val(obj.DBM_Path);
 $('#SettingsBotPath').val(obj.Bot_Path);
 $('#SettingsDiscordRPC').prop('checked', obj.Discord_RPC);
-//------------------
+
+//---------------------------------------------------------------------//
+// function SettingsSaveClick()
+//
+// This is the function that saves all settings set when you
+// press the Save button on Settings tab.
+//---------------------------------------------------------------------//
 
 function SettingsSaveClick() {
     obj.DBM_Path = $('#SettingsDBMPath').val();
@@ -21,13 +40,28 @@ function SettingsSaveClick() {
     fse.writeFileSync(dataDataPath, JSON.stringify(obj));
 }
 
+//---------------------------------------------------------------------//
+// function SettingsUnsaveClick()
+//
+// This is the function that unsaves all settings set when you
+// press the Unsave button on Settings tab.
+//---------------------------------------------------------------------//
+
 function SettingsUnsaveClick() {
     $('#SettingsDBMPath').val(obj.DBM_Path);
     $('#SettingsBotPath').val(obj.Bot_Path);
     $('#SettingsDiscordRPC').prop('checked', obj.Discord_RPC);
 }
 
-// Browser Button
+//---------------------------------------------------------------------//
+// Open Browser Window
+//
+// This is the system that opens the browser window when you
+// press the Browser button on Settings tab.
+//
+// OUTDATED // OUTDATED // OUTDATED // OUTDATED // OUTDATED // OUTDATED //
+//---------------------------------------------------------------------//
+
 document.getElementById('SettingsNotSecretBrowser1').addEventListener('click', _ => {
     document.getElementById('SettingsSecretBrowser1').click()
 });
@@ -40,11 +74,4 @@ document.getElementById('SettingsNotSecretBrowser2').addEventListener('click', _
 });
 function onFileChange2() {
     document.getElementById("SettingsBotPath").value = document.getElementById("SettingsSecretBrowser2").files[0].path;
-}
-//---------------
-
-/*// Language Stuff
-$('#SettingsLanguageSelect').on('change', function() {
-
-});
-//---------------*/
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/menu/sidebar/sidebar.ejs b/menu/sidebar/sidebar.ejs
index 2bad4fb..896a972 100644
--- a/menu/sidebar/sidebar.ejs
+++ b/menu/sidebar/sidebar.ejs
@@ -6,16 +6,16 @@
         </div>
         <p id="SlidebarLogoText">DBM Network Client</p>
     </div>
-    <div class="SlidebarSlideMenu_Button" id="SlidebarButtonMods" onclick="ModsTabClick()">
+    <div class="SlidebarSlideMenu_Button" id="SlidebarButtonMods" onclick="ButtonTabClick('#ModsWindow', 'Mods')">
         <p id="SlidebarButtonModsText">Mods</p>
     </div>
-	<div class="SlidebarSlideMenu_Button" id="SlidebarButtonBot" onclick="BotTabClick()">
+	<div class="SlidebarSlideMenu_Button" id="SlidebarButtonBot" onclick="ButtonTabClick('#BotWindow', 'Bot')">
         <p id="SlidebarButtonBotText">Bot</p>
     </div>
-    <div class="SlidebarSlideMenu_Button" id="SlidebarButtonSettings" onclick="SettingsTabClick()">
+    <div class="SlidebarSlideMenu_Button" id="SlidebarButtonSettings" onclick="ButtonTabClick('#SettingsWindow', 'Settings')">
         <p id="SlidebarButtonSettingsText">Settings</p>
     </div>
-    <div class="SlidebarSlideMenu_Button" id="SlidebarButtonChangelog" onclick="ChangelogTabClick()">
+    <div class="SlidebarSlideMenu_Button" id="SlidebarButtonChangelog" onclick="ButtonTabClick('#ChangelogWindow', 'Changelog')">
         <p id="SlidebarButtonChangelogText">Changelog</p>
     </div>
     <p id="SlidebarInfoBelow">© DBM Network<br><span id="SlidebarAppVersion"></span> <span id="SlidebarElectronUPStatus"></span></p>
diff --git a/menu/sidebar/sidebar.js b/menu/sidebar/sidebar.js
index 02f28fd..5770a50 100644
--- a/menu/sidebar/sidebar.js
+++ b/menu/sidebar/sidebar.js
@@ -1,74 +1,49 @@
-//--------------------------------------------Modules--------------------------------------------//
-var electron = require('electron');
-const {ipcRenderer} = electron;
+//---------------------------------------------------------------------//
+// Modules
+//
+// This is where you put the NPM Modules to use in this file.
+//---------------------------------------------------------------------//
 
+var electron = require('electron');
+var {ipcRenderer} = electron;
 var $ = jQuery = require('jquery');
-//-----------------------------------------------------------------------------------------------//
-
 
+//---------------------------------------------------------------------//
+// Transition Between Tabs
+//
+// This is the system that make transition between tabs when you
+// click in a new tab button.
+//---------------------------------------------------------------------//
 
-var blockerClick = false;
+var blockerClick = false; // Anti-abuse system for when you click quickly on sidebar buttons
 
-function ModsTabClick() {
-    if(blockerClick === false) {
+function ButtonTabClick(Window, TabName) {
+    if(blockerClick === false && !$(Window).is(":visible")) {
         blockerClick = true;
-        $('#BotWindow').fadeOut(200);
-        $('#SettingsWindow').fadeOut(200);
-        $('#ChangelogWindow').fadeOut(200);
-        setTimeout(() => {
-            $('#ModsWindow').fadeIn(200);
-            ipcRenderer.send('mode:changed', 'Mods');
-            blockerClick = false;
-        }, 200);
-    }
-}
 
-function BotTabClick() {
-    if(blockerClick === false) {
-        blockerClick = true;
-        $('#ModsWindow').fadeOut(200);
-        $('#SettingsWindow').fadeOut(200);
-        $('#ChangelogWindow').fadeOut(200);
-        setTimeout(() => {
-            $('#BotWindow').fadeIn(200);
-            ipcRenderer.send('mode:changed', 'Bot');
+        $('#MenuAllWindows > div').fadeOut(200).promise().done(function() {
+            $(Window).fadeIn(200)
+            ipcRenderer.send('mode:changed', TabName);
             blockerClick = false;
-        }, 200);
+        });
     }
 }
 
-function SettingsTabClick() {
-    if(blockerClick === false) {
-        blockerClick = true;
-        $('#ModsWindow').fadeOut(200);
-        $('#BotWindow').fadeOut(200);
-        $('#ChangelogWindow').fadeOut(200);
-        setTimeout(() => {
-            $('#SettingsWindow').fadeIn(200);
-            ipcRenderer.send('mode:changed', 'Settings');
-            blockerClick = false;
-        }, 200);
-    }
-}
-
-function ChangelogTabClick() {
-    if(blockerClick === false) {
-        blockerClick = true;
-        $('#ModsWindow').fadeOut(200);
-        $('#BotWindow').fadeOut(200);
-        $('#SettingsWindow').fadeOut(200);
-        setTimeout(() => {
-            $('#ChangelogWindow').fadeIn(200);
-            ipcRenderer.send('mode:changed', 'Changelog');
-            blockerClick = false;
-        }, 200);
-    }
-}
+//---------------------------------------------------------------------//
+// Show Current App Version
+//
+// This shows the current version of the app in the bottom corner.
+//---------------------------------------------------------------------//
 
 $('#SlidebarAppVersion').html(require('electron').remote.app.getVersion());
 
-//------------Electron Updater Stuff------------
+//---------------------------------------------------------------------//
+// Electron Auto Updater Status
+//
+// This shows the status of auto-updater in the bottom corner.
+// The system is in main.js file.
+//---------------------------------------------------------------------//
+
 ipcRenderer.on('ElectronUpdaterMES', function(event, text) {
     $('#SlidebarElectronUPStatus').html("- " + text);
-});
-//----------------------------------------------
\ No newline at end of file
+});
\ No newline at end of file