diff --git a/PROMS/VEPROMS User Interface/ShortcutLists.Designer.cs b/PROMS/VEPROMS User Interface/ShortcutLists.Designer.cs
index 6e3cbfaf..d73200b3 100644
--- a/PROMS/VEPROMS User Interface/ShortcutLists.Designer.cs	
+++ b/PROMS/VEPROMS User Interface/ShortcutLists.Designer.cs	
@@ -31,12 +31,12 @@ namespace VEPROMS
 			System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ShortcutLists));
 			this.scRtb = new System.Windows.Forms.RichTextBox();
 			this.panHlpShortcuts = new DevComponents.DotNetBar.PanelEx();
+			this.btnHlpScRibbon = new DevComponents.DotNetBar.ButtonX();
 			this.btnHlpScMisc = new DevComponents.DotNetBar.ButtonX();
 			this.btnHlpScTxtMods = new DevComponents.DotNetBar.ButtonX();
 			this.btnHlpScNav = new DevComponents.DotNetBar.ButtonX();
 			this.btnHlpScInsert = new DevComponents.DotNetBar.ButtonX();
 			this.expandableSplitter1 = new DevComponents.DotNetBar.ExpandableSplitter();
-			this.btnHlpScRibbon = new DevComponents.DotNetBar.ButtonX();
 			this.panHlpShortcuts.SuspendLayout();
 			this.SuspendLayout();
 			// 
@@ -73,11 +73,26 @@ namespace VEPROMS
 			this.panHlpShortcuts.TabIndex = 0;
 			this.panHlpShortcuts.ThemeAware = true;
 			// 
+			// btnHlpScRibbon
+			// 
+			this.btnHlpScRibbon.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
+			this.btnHlpScRibbon.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
+			this.btnHlpScRibbon.Dock = System.Windows.Forms.DockStyle.Top;
+			this.btnHlpScRibbon.FocusOnLeftMouseButtonDown = true;
+			this.btnHlpScRibbon.Font = new System.Drawing.Font("Microsoft Sans Serif", 10.2F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.btnHlpScRibbon.Location = new System.Drawing.Point(0, 144);
+			this.btnHlpScRibbon.Name = "btnHlpScRibbon";
+			this.btnHlpScRibbon.Size = new System.Drawing.Size(189, 36);
+			this.btnHlpScRibbon.TabIndex = 4;
+			this.btnHlpScRibbon.Text = "Ribbon Shortcuts";
+			this.btnHlpScRibbon.Click += new System.EventHandler(this.btnHlpScRibbon_Click);
+			// 
 			// btnHlpScMisc
 			// 
 			this.btnHlpScMisc.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
 			this.btnHlpScMisc.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
 			this.btnHlpScMisc.Dock = System.Windows.Forms.DockStyle.Top;
+			this.btnHlpScMisc.FocusOnLeftMouseButtonDown = true;
 			this.btnHlpScMisc.Font = new System.Drawing.Font("Microsoft Sans Serif", 10.2F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
 			this.btnHlpScMisc.Location = new System.Drawing.Point(0, 108);
 			this.btnHlpScMisc.Name = "btnHlpScMisc";
@@ -91,6 +106,7 @@ namespace VEPROMS
 			this.btnHlpScTxtMods.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
 			this.btnHlpScTxtMods.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
 			this.btnHlpScTxtMods.Dock = System.Windows.Forms.DockStyle.Top;
+			this.btnHlpScTxtMods.FocusOnLeftMouseButtonDown = true;
 			this.btnHlpScTxtMods.Font = new System.Drawing.Font("Microsoft Sans Serif", 10.2F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
 			this.btnHlpScTxtMods.Location = new System.Drawing.Point(0, 72);
 			this.btnHlpScTxtMods.Name = "btnHlpScTxtMods";
@@ -104,12 +120,14 @@ namespace VEPROMS
 			this.btnHlpScNav.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
 			this.btnHlpScNav.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
 			this.btnHlpScNav.Dock = System.Windows.Forms.DockStyle.Top;
+			this.btnHlpScNav.FocusOnLeftMouseButtonDown = true;
 			this.btnHlpScNav.Font = new System.Drawing.Font("Microsoft Sans Serif", 10.2F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
 			this.btnHlpScNav.Location = new System.Drawing.Point(0, 36);
 			this.btnHlpScNav.Name = "btnHlpScNav";
 			this.btnHlpScNav.Size = new System.Drawing.Size(189, 36);
 			this.btnHlpScNav.TabIndex = 1;
-			this.btnHlpScNav.Text = "Keyboard Naviation";
+			this.btnHlpScNav.TabStop = false;
+			this.btnHlpScNav.Text = "Keyboard Navigation";
 			this.btnHlpScNav.Click += new System.EventHandler(this.btnHlpScNav_Click);
 			// 
 			// btnHlpScInsert
@@ -117,6 +135,7 @@ namespace VEPROMS
 			this.btnHlpScInsert.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
 			this.btnHlpScInsert.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
 			this.btnHlpScInsert.Dock = System.Windows.Forms.DockStyle.Top;
+			this.btnHlpScInsert.FocusOnLeftMouseButtonDown = true;
 			this.btnHlpScInsert.Font = new System.Drawing.Font("Microsoft Sans Serif", 10.2F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
 			this.btnHlpScInsert.Location = new System.Drawing.Point(0, 0);
 			this.btnHlpScInsert.Name = "btnHlpScInsert";
@@ -156,19 +175,6 @@ namespace VEPROMS
 			this.expandableSplitter1.TabIndex = 3;
 			this.expandableSplitter1.TabStop = false;
 			// 
-			// btnHlpScRibbon
-			// 
-			this.btnHlpScRibbon.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
-			this.btnHlpScRibbon.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
-			this.btnHlpScRibbon.Dock = System.Windows.Forms.DockStyle.Top;
-			this.btnHlpScRibbon.Font = new System.Drawing.Font("Microsoft Sans Serif", 10.2F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.btnHlpScRibbon.Location = new System.Drawing.Point(0, 144);
-			this.btnHlpScRibbon.Name = "btnHlpScRibbon";
-			this.btnHlpScRibbon.Size = new System.Drawing.Size(189, 36);
-			this.btnHlpScRibbon.TabIndex = 4;
-			this.btnHlpScRibbon.Text = "Ribbon Shortcuts";
-			this.btnHlpScRibbon.Click += new System.EventHandler(this.btnHlpScRibbon_Click);
-			// 
 			// ShortcutLists
 			// 
 			this.ClientSize = new System.Drawing.Size(927, 768);
diff --git a/PROMS/VEPROMS User Interface/frmVEPROMS.cs b/PROMS/VEPROMS User Interface/frmVEPROMS.cs
index 4e5377c9..ad5392ad 100644
--- a/PROMS/VEPROMS User Interface/frmVEPROMS.cs	
+++ b/PROMS/VEPROMS User Interface/frmVEPROMS.cs	
@@ -1809,10 +1809,12 @@ namespace VEPROMS
 		}
 		private void btnUpdateFormat_Click(object sender, EventArgs e)
 		{
-			DirectoryInfo di = new DirectoryInfo(Properties.Settings.Default.FormatPath);
-			if (!di.Exists || !File.Exists(di.FullName + @"\fmtall") || !File.Exists(di.FullName + @"\genmacall"))
+			string tmp = Properties.Settings.Default.FormatPath;
+			DirectoryInfo di = null;
+			if (tmp != null && tmp !="") di = new DirectoryInfo(Properties.Settings.Default.FormatPath);
+			if (((tmp ?? "") == "") || (di != null && (!di.Exists || !File.Exists(di.FullName + @"\fmtall") || !File.Exists(di.FullName + @"\genmacall"))))
 			{
-				while (!di.Exists || !Directory.Exists(di.FullName + @"\fmtall") || !Directory.Exists(di.FullName + @"\genmacall"))
+				while (((tmp ?? "") == "") || (!di.Exists || !Directory.Exists(di.FullName + @"\fmtall") || !Directory.Exists(di.FullName + @"\genmacall")))
 				{
 					fbd.Description = "Select folder containing FmtAll and GenMacAll folders to update formats";
 					DialogResult dr = fbd.ShowDialog();
@@ -1822,6 +1824,7 @@ namespace VEPROMS
 						return;
 					}
 					di = new DirectoryInfo(fbd.SelectedPath);
+					tmp = di.FullName;
 				}
 				Properties.Settings.Default.FormatPath = fbd.SelectedPath;
 				Properties.Settings.Default.Save();