diff --git a/Saviour Backup System/mainWindow.cs b/Saviour Backup System/mainWindow.cs
index 2ec5051..4c4d668 100644
--- a/Saviour Backup System/mainWindow.cs	
+++ b/Saviour Backup System/mainWindow.cs	
@@ -151,6 +151,8 @@ namespace Saviour_Backup_System
             switch (e.CloseReason)
             {
                 case(CloseReason.ApplicationExitCall):
+                    formatDriveCapacityTimer.Stop();
+                    driveRefreshTimer.Stop();
                     this.Close();
                     break;
                 case(CloseReason.UserClosing):
diff --git a/Saviour Backup System/notificationIcon.cs b/Saviour Backup System/notificationIcon.cs
index 23e4dab..671c505 100644
--- a/Saviour Backup System/notificationIcon.cs	
+++ b/Saviour Backup System/notificationIcon.cs	
@@ -14,20 +14,21 @@ namespace Saviour_Backup_System
 
         internal notificationIcon()
         {
-           
             notifyIcon.Text = "Saviour Backup System";
             notifyIcon.Icon = Properties.Resources.redCDIconICO;
             populateList();
             notifyIcon.ContextMenu = contextMenu;
             notifyIcon.Visible = true; //finally displays the tray icon
         }
+
         private void populateList()
         {
             contextMenu.MenuItems.Add("Show Interface", displayWindow);
-
+            contextMenu.MenuItems.Add("Copy Progress", showProgress);
         }
-        private void displayWindow(object sender, EventArgs e) { setup.MW.showDisplay(); }
 
+        private void displayWindow(object sender, EventArgs e) { setup.MW.showDisplay(); }
+        private void showProgress(object sender, EventArgs e) { return; }
         internal void displayStillRunning() {
             notifyIcon.BalloonTipText = "Saviour backup system is still running in the background";
             notifyIcon.BalloonTipTitle = "Still running...";
diff --git a/Saviour Backup System/setup.cs b/Saviour Backup System/setup.cs
index 9a5cd9a..f2fe770 100644
--- a/Saviour Backup System/setup.cs	
+++ b/Saviour Backup System/setup.cs	
@@ -67,8 +67,12 @@ namespace Saviour_Backup_System
 
         internal static void closeProgram()
         {
-            Application.Exit();
-            
+            string exitMessage = "Are you sure you want to close Saviour Backup System? \n All copying backups and backup scanning will cease.";
+            DialogResult result = MessageBox.Show(exitMessage, "Saviour Backup System Exiting...", MessageBoxButtons.YesNo, MessageBoxIcon.Warning);
+            if ( result == System.Windows.Forms.DialogResult.Yes)
+            {
+                Application.Exit();
+            }
         }
     }
 }