diff --git a/index.html b/index.html
index 58eafe9b0..739a6081d 100644
--- a/index.html
+++ b/index.html
@@ -43,6 +43,7 @@
     <script src="src/CompanyJobApplication.js"></script>
 	<script src="src/Terminal.js"></script>
     <script src="src/PurchaseServers.js"></script>
+    <script src="src/CreateProgram.js"></script>
     <script src="src/Augmentations.js"></script>
 	
     <script src="src/engine.js"></script>
@@ -302,6 +303,7 @@
 	
 	<!-- Create a program(executable) -->
 	<div id="create-program-container">
+        <ul id="create-program-list"> </ul>
 	</div>
 	
 	<!-- Factions -->
diff --git a/src/Company.js b/src/Company.js
index d9df7caf7..9a0a07a6d 100644
--- a/src/Company.js
+++ b/src/Company.js
@@ -166,7 +166,7 @@ CompanyPosition.prototype.isBusinessJob = function() {
         this.positionName == "Chief Executive Officer") {
             return true;
     }
-    return true;
+    return false;
 }
 
 CompanyPosition.prototype.isSecurityJob = function() {
diff --git a/src/CreateProgram.js b/src/CreateProgram.js
new file mode 100644
index 000000000..67cb95812
--- /dev/null
+++ b/src/CreateProgram.js
@@ -0,0 +1,4 @@
+/* Create programs */
+function displayCreateProgramContent() {
+    
+}
\ No newline at end of file
diff --git a/src/Location.js b/src/Location.js
index 16a8fd6e4..5aa9e3bca 100644
--- a/src/Location.js
+++ b/src/Location.js
@@ -196,8 +196,9 @@ displayLocationContent = function() {
             return false;
         });
         
-        //Change the text for the corresponding position from "Apply for X Job" to "Apply for promotion"
         var currPos = Player.companyPosition;
+        
+        //Change the text for the corresponding position from "Apply for X Job" to "Apply for promotion"
         if (currPos.isSoftwareJob()) {
             softwareJob.innerHTML = "Apply for a promotion (Software)";
         } else if (currPos.isITJob()) {
@@ -212,10 +213,6 @@ displayLocationContent = function() {
             securityJob.innerHTML = "Apply for a promotion (Security)";
         } else if (currPos.isAgentJob()) {
             agentJob.innerHTML = "Apply for a promotion (Agent)";
-        } else if (currPos.positionName == CompanyPositions.Employee) {
-            employeeJob.style.display = "none";
-        } else if (currPos.positionName == CompanyPositions.Waiter) {
-            waiterJob.style.display = "none";
         }
     } else {
 		jobTitle.style.display = "none";
@@ -727,8 +724,22 @@ displayLocationContent = function() {
             gymTrainDex.style.display = "block";
             gymTrainAgi.style.display = "block";
             break;
+            
+        default:
+            console.log("ERROR: INVALID LOCATION");
 
     }
+    
+    //Make the "Apply to be Employee and Waiter" texts disappear if you already hold the job
+    if (loc == Player.companyName) {
+        var currPos = Player.companyPosition;
+        
+        if (currPos.positionName == CompanyPositions.Employee.positionName) {
+            employeeJob.style.display = "none";
+        } else if (currPos.positionName == CompanyPositions.Waiter.positionName) {
+            waiterJob.style.display = "none";
+        }
+    }
 }
 
 initLocationButtons = function() {
diff --git a/src/engine.js b/src/engine.js
index d5f805647..4e03691e8 100644
--- a/src/engine.js
+++ b/src/engine.js
@@ -202,6 +202,7 @@ var Engine = {
     loadCreateProgramContent: function() {
         Engine.hideAllContent();
         Engine.Display.createProgramContent.style.visibility = "visible";
+        displayCreateProgramContent();
         
         Engine.currentPage = Engine.Page.CreateProgram;
     },
@@ -296,7 +297,7 @@ var Engine = {
                                                  'Dexterity: ' + (Player.dexterity).toLocaleString() + '<br><br>' + 
                                                  'Agility: ' + (Player.agility).toLocaleString() + '<br><br>' +
                                                  'Charisma: ' + (Player.charisma).toLocaleString() + '<br><br>' +
-                                                 'Servers owned: ' + Player.purchasedServers.length + '<br><br>';
+                                                 'Servers owned: ' + Player.purchasedServers.length + '<br><br>' + 
                                                  'Hacking experience: ' + (Player.hacking_exp.toFixed(4)).toLocaleString() + '<br><br>' + 
                                                  'Strength experience: ' +  (Player.strength_exp.toFixed(4)).toLocaleString() + '<br><br>' + 
                                                  'Defense experience: ' + (Player.defense_exp.toFixed(4)).toLocaleString() + '<br><br>' +