diff --git a/Louis'-Pharmacy_CNSA212-FP/frmInfo.cs b/Louis'-Pharmacy_CNSA212-FP/frmInfo.cs
index af052f4..db0c65b 100644
--- a/Louis'-Pharmacy_CNSA212-FP/frmInfo.cs
+++ b/Louis'-Pharmacy_CNSA212-FP/frmInfo.cs
@@ -46,6 +46,8 @@ namespace Louis__Pharmacy_CNSA212_FP
             cmuMedicationDelete.Enabled = false;
             cmuPrescriptionEdit.Enabled = false;
             cmuPrescriptionDelete.Enabled = false;
+            cmuPrescriptionRefillThis.Enabled = false;
+            cmuPrescriptionViewRefills.Enabled = false;
 
             dgvMedication.Visible = false;
             dgvPatient.Visible = false;
@@ -226,6 +228,7 @@ namespace Louis__Pharmacy_CNSA212_FP
                                 }
                                 else
                                 {
+                                    
                                     dgvPatient.Visible = false; // Hide the DataGridView if no results are found.
                                     MessageBox.Show("No records found.");
                                 }
@@ -269,6 +272,7 @@ namespace Louis__Pharmacy_CNSA212_FP
             cmuPatientDelete.Enabled = dgvPatient.Rows.Count > 0;
             dgvPatient.Visible = dgvPatient.Rows.Count > 0;
 
+
             dgvPatient.Focus();
 
         }
@@ -400,7 +404,7 @@ namespace Louis__Pharmacy_CNSA212_FP
                                 }
                                 else
                                 {
-                                    dgvPatient.Visible = false; // Hide the DataGridView if no results are found.
+                                    dgvPhysician.Visible = false; // Hide the DataGridView if no results are found.
                                     MessageBox.Show("No records found.");
                                 }
                                 
@@ -486,7 +490,6 @@ namespace Louis__Pharmacy_CNSA212_FP
 
         private void dgvPatient_CellContentClick(object sender, DataGridViewCellEventArgs e)
         {
-            cmuPatientEdit_Click(sender, e);
         }
 
         private void Panel1_Paint(object sender, PaintEventArgs e)
@@ -752,7 +755,7 @@ namespace Louis__Pharmacy_CNSA212_FP
                             }
                             else
                             {
-                                dgvPatient.Visible = false; // Hide the DataGridView if no results are found.
+                                dgvPrescription.Visible = false; // Hide the DataGridView if no results are found.
                                 MessageBox.Show("No records found.");
                             }
 
@@ -777,6 +780,8 @@ namespace Louis__Pharmacy_CNSA212_FP
 
             cmuPrescriptionEdit.Enabled = dgvPrescription.Rows.Count > 0;
             cmuPrescriptionDelete.Enabled = dgvPrescription.Rows.Count > 0;
+            cmuPrescriptionRefillThis.Enabled = dgvPrescription.Rows.Count > 0;
+            cmuPrescriptionViewRefills.Enabled = dgvPrescription.Rows.Count > 0;
             
             dgvPrescription.Visible = dgvPrescription.Rows.Count > 0;
 
@@ -821,6 +826,12 @@ namespace Louis__Pharmacy_CNSA212_FP
                 else
                 {
                     refillID = PharmacyDataTier.GetNextRefillID().ToString();
+
+                    while (refillID.Length < 10)
+                    {
+                        refillID = "0" + refillID;
+                    }
+                    
                     date = DateTime.Now;
                     patientID = row.Cells[6].Value.ToString() ;
                     medicationID = row.Cells[5].Value.ToString() ;
diff --git a/Louis'-Pharmacy_CNSA212-FP/frmMain.Designer.cs b/Louis'-Pharmacy_CNSA212-FP/frmMain.Designer.cs
index a481430..0ecea99 100644
--- a/Louis'-Pharmacy_CNSA212-FP/frmMain.Designer.cs
+++ b/Louis'-Pharmacy_CNSA212-FP/frmMain.Designer.cs
@@ -31,7 +31,6 @@
             this.menuStrip1 = new System.Windows.Forms.MenuStrip();
             this.mnuNavigation = new System.Windows.Forms.ToolStripMenuItem();
             this.mnuNavigationView = new System.Windows.Forms.ToolStripMenuItem();
-            this.mnuNavigationAURRefill = new System.Windows.Forms.ToolStripMenuItem();
             this.mnuWindow = new System.Windows.Forms.ToolStripMenuItem();
             this.mnuWindowArrangeIcons = new System.Windows.Forms.ToolStripMenuItem();
             this.mnuWindowCascade = new System.Windows.Forms.ToolStripMenuItem();
@@ -54,7 +53,7 @@
             // 
             // mnuNavigation
             // 
-            this.mnuNavigation.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.mnuNavigationView, this.mnuNavigationAURRefill });
+            this.mnuNavigation.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.mnuNavigationView });
             this.mnuNavigation.Name = "mnuNavigation";
             this.mnuNavigation.Size = new System.Drawing.Size(77, 20);
             this.mnuNavigation.Text = "Navigation";
@@ -62,17 +61,10 @@
             // mnuNavigationView
             // 
             this.mnuNavigationView.Name = "mnuNavigationView";
-            this.mnuNavigationView.Size = new System.Drawing.Size(302, 22);
-            this.mnuNavigationView.Text = "Patient/Prescription/Physician/Prescription";
+            this.mnuNavigationView.Size = new System.Drawing.Size(152, 22);
+            this.mnuNavigationView.Text = "Open Form";
             this.mnuNavigationView.Click += new System.EventHandler(this.mnuNavigationView_Click);
             // 
-            // mnuNavigationAURRefill
-            // 
-            this.mnuNavigationAURRefill.Name = "mnuNavigationAURRefill";
-            this.mnuNavigationAURRefill.Size = new System.Drawing.Size(302, 22);
-            this.mnuNavigationAURRefill.Text = "Add/Update/Remove Refill";
-            this.mnuNavigationAURRefill.Click += new System.EventHandler(this.mnuNavigationAURRefill_Click);
-            // 
             // mnuWindow
             // 
             this.mnuWindow.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.mnuWindowArrangeIcons, this.mnuWindowCascade, this.mnuWindowHorizontal, this.mnuWindowVertical, this.mnuWindowCloseAll });
@@ -151,7 +143,6 @@
         private System.Windows.Forms.MenuStrip menuStrip1;
         private System.Windows.Forms.ToolStripMenuItem mnuNavigation;
         private System.Windows.Forms.ToolStripMenuItem mnuNavigationView;
-        private System.Windows.Forms.ToolStripMenuItem mnuNavigationAURRefill;
         private System.Windows.Forms.ToolStripMenuItem mnuWindow;
         private System.Windows.Forms.ToolStripMenuItem mnuHelp;
         private System.Windows.Forms.ToolStripMenuItem mnuHelpAbout;
diff --git a/Louis'-Pharmacy_CNSA212-FP/frmMain.cs b/Louis'-Pharmacy_CNSA212-FP/frmMain.cs
index b837f17..4768008 100644
--- a/Louis'-Pharmacy_CNSA212-FP/frmMain.cs
+++ b/Louis'-Pharmacy_CNSA212-FP/frmMain.cs
@@ -19,8 +19,10 @@ namespace Louis__Pharmacy_CNSA212_FP
 
         private void frmMain_Load(object sender, EventArgs e)
         {
-            frmWelcome formWelcome = new frmWelcome();
+            // frmWelcome formWelcome = new frmWelcome();
 
+            frmInfo formWelcome = new frmInfo();
+            
             formWelcome.MdiParent = this;
             formWelcome.StartPosition = FormStartPosition.CenterScreen;
             formWelcome.Show();
@@ -74,7 +76,7 @@ namespace Louis__Pharmacy_CNSA212_FP
             //formRefill.Show();
             //formRefill.Focus();
 
-            mnuNavigationAURRefill.Checked = true;
+            // mnuNavigationAURRefill.Checked = true;
         }
 
         private void mnuWindowArrangeIcons_Click(object sender, EventArgs e)