diff --git a/Advanced Software Engineering/Advanced Software Engineering/Menu.cs b/Advanced Software Engineering/Advanced Software Engineering/Menu.cs
index 314021f..2433496 100644
--- a/Advanced Software Engineering/Advanced Software Engineering/Menu.cs	
+++ b/Advanced Software Engineering/Advanced Software Engineering/Menu.cs	
@@ -19,20 +19,17 @@ namespace Advanced_Software_Engineering
         
         private void button1_Click(object sender, EventArgs e)
         {
-            SettingsAndHelperFunctions.NumberOfWindows++;
-            new Text_Editor().Show();
             this.Hide();
         }
 
         private void button2_Click(object sender, EventArgs e)
         {
-            SettingsAndHelperFunctions.NumberOfWindows++;
+            new Text_Editor().Show();
             this.Hide();
         }
 
         private void button3_Click(object sender, EventArgs e)
         {
-            SettingsAndHelperFunctions.NumberOfWindows++;
             this.Hide();
         }
 
diff --git a/Advanced Software Engineering/Advanced Software Engineering/Text Editor.Designer.cs b/Advanced Software Engineering/Advanced Software Engineering/Text Editor.Designer.cs
index babf52c..663e57d 100644
--- a/Advanced Software Engineering/Advanced Software Engineering/Text Editor.Designer.cs	
+++ b/Advanced Software Engineering/Advanced Software Engineering/Text Editor.Designer.cs	
@@ -125,16 +125,16 @@ namespace Advanced_Software_Engineering
             // aboutToolStripMenuItem
             // 
             this.aboutToolStripMenuItem.Name = "aboutToolStripMenuItem";
-            this.aboutToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+            this.aboutToolStripMenuItem.Size = new System.Drawing.Size(107, 22);
             this.aboutToolStripMenuItem.Text = "About";
             // 
             // helpToolStripMenuItem1
             // 
             this.helpToolStripMenuItem1.Name = "helpToolStripMenuItem1";
-            this.helpToolStripMenuItem1.Size = new System.Drawing.Size(180, 22);
+            this.helpToolStripMenuItem1.Size = new System.Drawing.Size(107, 22);
             this.helpToolStripMenuItem1.Text = "Help";
             // 
-            // Console
+            // Text_Editor
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
@@ -142,8 +142,8 @@ namespace Advanced_Software_Engineering
             this.Controls.Add(this.textBox1);
             this.Controls.Add(this.menuStrip1);
             this.MainMenuStrip = this.menuStrip1;
-            this.Name = "Console";
-            this.Text = "Console";
+            this.Name = "Text_Editor";
+            this.Text = "Advanced Software Engineering - Text Editor";
             this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.Console_FormClosed);
             this.menuStrip1.ResumeLayout(false);
             this.menuStrip1.PerformLayout();
diff --git a/Advanced Software Engineering/Advanced Software Engineering/Text Editor.cs b/Advanced Software Engineering/Advanced Software Engineering/Text Editor.cs
index f7633be..6999c35 100644
--- a/Advanced Software Engineering/Advanced Software Engineering/Text Editor.cs	
+++ b/Advanced Software Engineering/Advanced Software Engineering/Text Editor.cs	
@@ -12,8 +12,11 @@ namespace Advanced_Software_Engineering
 {
     public partial class Text_Editor : Form
     {
+        const String DefaultTitleString = "Advanced Software Engineering - Text Editor ";
+
         public Text_Editor()
         {
+            SettingsAndHelperFunctions.NumberOfWindows++;
             InitializeComponent();
         }
 
@@ -24,7 +27,7 @@ namespace Advanced_Software_Engineering
 
         private void newFileToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            //Text editor here
+            new Text_Editor().Show();
         }
     }
 }
diff --git a/Advanced Software Engineering/Advanced Software Engineering/Text Editor.resx b/Advanced Software Engineering/Advanced Software Engineering/Text Editor.resx
index d5494e3..3d0e18f 100644
--- a/Advanced Software Engineering/Advanced Software Engineering/Text Editor.resx	
+++ b/Advanced Software Engineering/Advanced Software Engineering/Text Editor.resx	
@@ -120,4 +120,7 @@
   <metadata name="menuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
+  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>59</value>
+  </metadata>
 </root>
\ No newline at end of file