diff --git a/app/app.js b/app/app.js
index 247b711..9e3bbca 100644
--- a/app/app.js
+++ b/app/app.js
@@ -448,6 +448,7 @@ var app = new Vue({
 		 */
 		moveArrayPosition: function(arr, old_index, new_index)
 		{
+
 			if (new_index == old_index)
 			{
 				// No change
@@ -457,7 +458,7 @@ var app = new Vue({
 			if (new_index > old_index)
 			{
 				// Moving forward in array
-				if (old_index == this.$root.sections.work.length - 1) return;	// Cannot move beyond the end of the array
+				if (old_index == arr - 1) return;	// Cannot move beyond the end of the array
 			}
 			if (new_index < old_index)
 			{
@@ -475,6 +476,8 @@ var app = new Vue({
 				}
 			}
 
+			
+
 			arr.splice(new_index, 0, arr.splice(old_index, 1)[0]);
 
 			return arr; // for testing
diff --git a/components/section_education.js b/components/section_education.js
index 493c7ce..0fd0bc1 100644
--- a/components/section_education.js
+++ b/components/section_education.js
@@ -1,8 +1,6 @@
 var sectionEducationComponent = {
 	template: '#section-education-template',
 
-	
-
 	mounted: function()
 	{
 		
@@ -60,6 +58,30 @@ var sectionEducationComponent = {
 		moveDownClicked: function(index)
 		{
 			this.$root.moveArrayPosition(this.$root.sections.education, index, index + 1);
+		},
+
+		deleteClickedCourse: function(eIndex, index)
+		{
+			var response = confirm("Are you sure you want to delete this Course?");
+
+			if (response == true)
+			{
+				this.$root.sections.education[eIndex].courses.splice(index, 1);
+			}
+		},
+
+		moveUpClickedCourse: function(eIndex,index)
+		{
+			if (index > 0)
+				this.$root.moveArrayPosition(this.$root.sections.education[eIndex].courses, index, index - 1);
+		},
+
+
+		moveDownClickedCourse: function(eIndex,index)
+		{
+			if (index < this.$root.sections.education[eIndex].courses.length)
+				this.$root.moveArrayPosition(this.$root.sections.education[eIndex].courses, index, index + 1);
 		}
+
 	}
 };
\ No newline at end of file
diff --git a/components/section_work.js b/components/section_work.js
index ecd9fa6..26b676f 100644
--- a/components/section_work.js
+++ b/components/section_work.js
@@ -42,16 +42,6 @@ var sectionWorkComponent = {
 			this.$root.sections.work[index].highlights.push(item);
 		},
 
-		deleteClickedHighlight: function(wIndex, index)
-		{
-			var response = confirm("Are you sure you want to delete this highlight?");
-
-			if (response == true)
-			{
-				this.$root.sections.work[wIndex].highlights.splice(index, 1);
-			}
-		},
-
 		deleteClicked: function(index)
 		{
 			var response = confirm("Are you sure you want to delete this position?");
@@ -74,6 +64,16 @@ var sectionWorkComponent = {
 			this.$root.moveArrayPosition(this.$root.sections.work, index, index + 1);
 		},
 
+		deleteClickedHighlight: function(wIndex, index)
+		{
+			var response = confirm("Are you sure you want to delete this highlight?");
+
+			if (response == true)
+			{
+				this.$root.sections.work[wIndex].highlights.splice(index, 1);
+			}
+		},
+
 		moveUpClickedHighlight: function(wIndex,index)
 		{
 			if (index > 0)
diff --git a/components/simple_list_item.js b/components/simple_list_item.js
new file mode 100644
index 0000000..3e4338d
--- /dev/null
+++ b/components/simple_list_item.js
@@ -0,0 +1,63 @@
+Vue.component("simple-list-item", {
+	template: '#simple-list-item-template',
+
+
+	props: [
+		'modelitem',
+		'id'
+	],
+
+
+	
+
+	mounted: function()
+	{
+		this.displayFormat = (this.format ? this.format : "");
+	},
+
+
+
+	destroyed: function()
+	{
+		
+	},
+
+
+	
+	data: function()
+	{
+		return {
+			
+		};
+	},
+
+	
+
+	methods: {
+		getModelItem: function()
+		{
+			return (this.modelitem ? this.modelitem : "???");
+		},
+
+		
+		deleteClick: function()
+		{
+			//alert("deleteClick");
+			this.$emit('delete-clicked', this.id);
+		},
+
+
+		moveUpClick: function()
+		{
+			//alert("moveUpClick");
+			this.$emit('move-up-clicked', this.id);
+		},
+
+
+		moveDownClick: function()
+		{
+			//alert("moveDownClick");
+			this.$emit('move-down-clicked', this.id);
+		},
+	}
+});
\ No newline at end of file
diff --git a/index.html b/index.html
index eb4f7f9..3ba796e 100644
--- a/index.html
+++ b/index.html
@@ -373,14 +373,25 @@
                                 <small id="highlightsHelp" class="form-help text-muted">Briefly describe successes and outcomes (e.g. Increased profits by 20% from 2011-2012 through viral advertising).</small>
     
                                 <button type="button" class="w3-btn w3-white w3-border w3-border-blue w3-round w3-padding-small" v-on:click="addHighlight(w_index)">+ Add Highlight</button>
-                                <ol>
-                                    <li v-for="(highlight, h_index) in work.highlights">
-                                        <input class="w3-input w3-border" type="text" v-model="$root.sections.work[w_index].highlights[h_index]">
-                                        <button type="button" class="w3-btn w3-white w3-border w3-border-blue w3-round w3-padding-small" v-on:click="moveUpClickedHighlight(w_index,h_index)">^ Highlight</button>
-                                        <button type="button" class="w3-btn w3-white w3-border w3-border-blue w3-round w3-padding-small" v-on:click="moveDownClickedHighlight(w_index,h_index)">v Highlight</button>
-                                        <button type="button" class="w3-btn w3-white w3-border w3-border-blue w3-round w3-padding-small" v-on:click="deleteClickedHighlight(w_index,h_index)">X Highlight</button>
-                                    </li>
-                                </ol>
+
+                                
+
+                                <form class="margin-top-32" v-for="(highlight, h_index) in work.highlights">
+                                <simple-list-item v-bind:modelitem="$root.sections.work[w_index].highlights" v-bind:id="h_index" v-on:delete-clicked="deleteClickedHighlight(w_index,h_index)" v-on:move-up-clicked="moveUpClickedHighlight(w_index,h_index)" v-on:move-down-clicked="moveDownClickedHighlight(w_index,h_index)"></simple-list-item>
+                                </form>
+<!--
+                                <div class="w3-row" v-for="(highlight, h_index) in work.highlights">
+                                    <div class="w3-col s9">
+                                        <input class="w3-input w3-border" type="text" v-model="$root.sections.work[w_index].highlights[h_index]"/>
+                                    </div>
+                                    <div class="w3-col s3 w3-right-align">
+                                        <i class="fas fa-times w3-margin-right" style="cursor: pointer;" v-on:click="deleteClickedHighlight(w_index,h_index)"></i>
+                                        <i class="fas fa-chevron-up" style="cursor: pointer;" v-on:click="moveUpClickedHighlight(w_index,h_index)"></i>
+                                        <i class="fas fa-chevron-down" style="cursor: pointer;" v-on:click="moveDownClickedHighlight(w_index,h_index)"></i>
+                                    </div>
+                                </div>
+-->
+
                             </div>
                         </form>
                     </div>
@@ -525,11 +536,11 @@
                                 <small id="highlightsHelp" class="form-help text-muted">List notable courses/subjects (e.g. H1302 - Introduction to American history).</small>
     
                                 <button type="button" class="w3-btn w3-white w3-border w3-border-blue w3-round w3-padding-small" v-on:click="addCourse(e_index)">+ Add Course</button>
-                                <ol>
-                                    <li v-for="(course, c_index) in edu.courses">
-                                        <input class="w3-input w3-border" type="text" v-model="$root.sections.education[e_index].courses[c_index]">
-                                    </li>
-                                </ol>
+
+                                
+                                <form class="margin-top-32" v-for="(course, c_index) in edu.courses">
+                                    <simple-list-item v-bind:modelitem="$root.sections.education[e_index].courses" v-bind:id="c_index" v-on:delete-clicked="deleteClickedCourse(e_index,c_index)" v-on:move-up-clicked="moveUpClickedCourse(e_index,c_index)" v-on:move-down-clicked="moveDownClickedCourse(e_index,c_index)"></simple-list-item>
+                                    </form>
                             </div>
                         </form>
                     </div>
@@ -1244,6 +1255,22 @@
             </div>
         </template>
 
+        <template type="text/x-template" id="simple-list-item-template" lang="html">
+            <div id="simple-list-item-root">
+
+            <div class="w3-row">
+                <div class="w3-col s9">
+                    <input class="w3-input w3-border" type="text" v-model="modelitem[id]"/>
+                </div>
+                <div class="w3-col s3 w3-right-align">
+                    <i class="fas fa-times w3-margin-right" style="cursor: pointer;" v-on:click="deleteClick"></i>
+                    <i class="fas fa-chevron-up" style="cursor: pointer;" v-on:click="moveUpClick"></i>
+                    <i class="fas fa-chevron-down" style="cursor: pointer;" v-on:click="moveDownClick"></i>
+                </div>
+            </div>
+            </div>
+        </template>
+
         <template type="text/x-template" id="card-header-template" lang="html">
             <div id="card-header-root">
                 <header class="w3-container w3-dark-grey w3-padding-16" v-bind:id="'header' + id">
@@ -1370,6 +1397,7 @@
         <script type="text/javascript" src="components/preview_resume.js"></script>
         <script type="text/javascript" src="components/preview_single_field.js"></script>
         <script type="text/javascript" src="components/card_header.js"></script>
+        <script type="text/javascript" src="components/simple_list_item.js"></script>
         <script type="text/javascript" src="components/import.js"></script>
         <script type="text/javascript" src="components/export.js"></script>
         <script type="text/javascript" src="components/about.js"></script>
diff --git a/serve.ps1 b/serve.ps1
new file mode 100644
index 0000000..6c8a49e
Binary files /dev/null and b/serve.ps1 differ