diff --git a/popup.css b/css/popup.css
similarity index 100%
rename from popup.css
rename to css/popup.css
diff --git a/styles.css b/css/styles.css
similarity index 94%
rename from styles.css
rename to css/styles.css
index 43c8bd5d..2d2fd3c0 100644
--- a/styles.css
+++ b/css/styles.css
@@ -1,197 +1,197 @@
-/* The Modal (background) */
-.modal {
-    display: none; /* Hidden by default */ 
-    position: fixed; /* Stay in place */
-    z-index: 1; /* Sit on top */
-    padding-top: 100px; /* Location of the box */
-    left: 0;
-    top: 0;
-    width: 100%; 
-    height: 100%; /* Full height */
-    background-color: rgb(0,0,0); /* Fallback color */
-    background-color: rgba(0,0,0,0.4); /* Black w/ opacity */
-}
-
-.modal-content {
-    background-color: #fefefe;
-    margin: auto;
-    max-height: 85%;
-    overflow-y: auto;
-    padding: 20px;
-    border: 1px solid #888;
-    width: 50%;
-}
-
-
-/* The Close Button */
-.close {
-    color: #aaaaaa;
-    float: right;
-    padding: 5px;
-    font-size: 28px;
-    font-weight: bold;
-}
-
-.title {
-    font-size: x-large;
-    font-weight: bold ;
-    padding-top: 5px;
-    padding-left: 5px;
-    margin:5px 0px 5px 0px;
-
-}
-.description {
-    padding: 5px;
-    font-size: 15px;
-    font-weight: normal;
-
-}
-
-.profname {
-    margin-left: 5px;
-    padding-bottom: 5px;
-    font-size: medium;
-    margin-top: 10px;
-}
-
-.dateTimePlace {
-    margin-left: 5px;
-    font-size: smaller;
-    font-weight: bold;
-}
-
-#chart {
-	min-width: auto;
-	max-width: 800px;
-	height: 250px;
-	margin: 0 auto
-    z-index:1;
-}
-
-.card {
-    /* Add shadows to create the "card" effect */
-    transition: 0.3s;
-    margin-bottom: 10px;
-    box-shadow:0 2px 5px 0 rgba(0,0,0,0.16),0 2px 10px 0 rgba(0,0,0,0.12)
-}
-
-/* On mouse-over, add a deeper shadow */
-.card:hover {
-    box-shadow:0 4px 10px 0 rgba(0,0,0,0.2),0 4px 20px 0 rgba(0,0,0,0.19)
-}
-
-/* Add some padding inside the card container */
-.cardcontainer {
-    padding: 2px 16px;
-    transition:width 300ms ease-in-out, height 300ms ease-in-out;
-}
-
-.description {
-    padding: 10px;
-}
-
-.close:hover,
-.close:focus {
-    color: #000;
-    text-decoration: none;
-    cursor: pointer;
-}
-
-.topbuttons .matbut {
-    display:inline-block;
-}
-
-/* Material style */
-.matbut {
-  border: none;
-  outline: none;
-  cursor: pointer;
-  color: white;
-  margin: 10px 10px 10px 0px;
-  padding: 10px 10px;
-  border-radius: 10px;
-  font-size: medium;
-  font-style: bold;
-  box-shadow: 2px 2px 4px rgba(0, 0, 0, .4);
-  background: #FF9800;
-}
-
-/* Ripple magic */
-.matbut{
-  position: relative;
-  overflow: hidden;
-}
-
-.matbut:after {
-  content: '';
-  position: absolute;
-  top: 50%;
-  left: 50%;
-  width: 5px;
-  height: 5px;
-  background: rgba(255, 255, 255, .5);
-  opacity: 0;
-  border-radius: 100%;
-  transform: scale(1, 1) translate(-50%);
-  transform-origin: 50% 50%;
-}
-
-@keyframes ripple {
-  0% {
-    transform: scale(0, 0);
-    opacity: 1;
-}
-20% {
-    transform: scale(25, 25);
-    opacity: 1;
-}
-100% {
-    opacity: 0;
-    transform: scale(40, 40);
-}
-}
-
-.matbut:focus:not(:active)::after {
-  animation: ripple 1s ease-out;
-}
-
-#snackbar {
-    visibility: hidden;
-    min-width: 250px; 
-    margin-left: -200px; 
-    background-color: #333;
-    color: #fff; 
-    border-radius: 2px; 
-    padding: 16px; 
-    position: fixed; 
-    z-index: 1; 
-    left: 50%; 
-    bottom: 30px;
-}
-
-#snackbar.show {
-    visibility: visible; 
-
-    -webkit-animation: fadein 0.5s, fadeout 0.5s 2.5s;
-    animation: fadein 0.5s, fadeout 0.5s 2.5s;
-}
-
-@-webkit-keyframes fadein {
-    from {bottom: 0; opacity: 0;} 
-    to {bottom: 30px; opacity: 1;}
-}
-
-@keyframes fadein {
-    from {bottom: 0; opacity: 0;}
-    to {bottom: 30px; opacity: 1;}
-}
-
-@-webkit-keyframes fadeout {
-    from {bottom: 30px; opacity: 1;} 
-    to {bottom: 0; opacity: 0;}
-}
-
-@keyframes fadeout {
-    from {bottom: 30px; opacity: 1;}
-    to {bottom: 0; opacity: 0;}
+/* The Modal (background) */
+.modal {
+    display: none; /* Hidden by default */ 
+    position: fixed; /* Stay in place */
+    z-index: 1; /* Sit on top */
+    padding-top: 100px; /* Location of the box */
+    left: 0;
+    top: 0;
+    width: 100%; 
+    height: 100%; /* Full height */
+    background-color: rgb(0,0,0); /* Fallback color */
+    background-color: rgba(0,0,0,0.4); /* Black w/ opacity */
+}
+
+.modal-content {
+    background-color: #fefefe;
+    margin: auto;
+    max-height: 85%;
+    overflow-y: auto;
+    padding: 20px;
+    border: 1px solid #888;
+    width: 50%;
+}
+
+
+/* The Close Button */
+.close {
+    color: #aaaaaa;
+    float: right;
+    padding: 5px;
+    font-size: 28px;
+    font-weight: bold;
+}
+
+.title {
+    font-size: x-large;
+    font-weight: bold ;
+    padding-top: 5px;
+    padding-left: 5px;
+    margin:5px 0px 5px 0px;
+
+}
+.description {
+    padding: 5px;
+    font-size: 15px;
+    font-weight: normal;
+
+}
+
+.profname {
+    margin-left: 5px;
+    padding-bottom: 5px;
+    font-size: medium;
+    margin-top: 10px;
+}
+
+.dateTimePlace {
+    margin-left: 5px;
+    font-size: smaller;
+    font-weight: bold;
+}
+
+#chart {
+	min-width: auto;
+	max-width: 800px;
+	height: 250px;
+	margin: 0 auto
+    z-index:1;
+}
+
+.card {
+    /* Add shadows to create the "card" effect */
+    transition: 0.3s;
+    margin-bottom: 10px;
+    box-shadow:0 2px 5px 0 rgba(0,0,0,0.16),0 2px 10px 0 rgba(0,0,0,0.12)
+}
+
+/* On mouse-over, add a deeper shadow */
+.card:hover {
+    box-shadow:0 4px 10px 0 rgba(0,0,0,0.2),0 4px 20px 0 rgba(0,0,0,0.19)
+}
+
+/* Add some padding inside the card container */
+.cardcontainer {
+    padding: 2px 16px;
+    transition:width 300ms ease-in-out, height 300ms ease-in-out;
+}
+
+.description {
+    padding: 10px;
+}
+
+.close:hover,
+.close:focus {
+    color: #000;
+    text-decoration: none;
+    cursor: pointer;
+}
+
+.topbuttons .matbut {
+    display:inline-block;
+}
+
+/* Material style */
+.matbut {
+  border: none;
+  outline: none;
+  cursor: pointer;
+  color: white;
+  margin: 10px 10px 10px 0px;
+  padding: 10px 10px;
+  border-radius: 10px;
+  font-size: medium;
+  font-style: bold;
+  box-shadow: 2px 2px 4px rgba(0, 0, 0, .4);
+  background: #FF9800;
+}
+
+/* Ripple magic */
+.matbut{
+  position: relative;
+  overflow: hidden;
+}
+
+.matbut:after {
+  content: '';
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  width: 5px;
+  height: 5px;
+  background: rgba(255, 255, 255, .5);
+  opacity: 0;
+  border-radius: 100%;
+  transform: scale(1, 1) translate(-50%);
+  transform-origin: 50% 50%;
+}
+
+@keyframes ripple {
+  0% {
+    transform: scale(0, 0);
+    opacity: 1;
+}
+20% {
+    transform: scale(25, 25);
+    opacity: 1;
+}
+100% {
+    opacity: 0;
+    transform: scale(40, 40);
+}
+}
+
+.matbut:focus:not(:active)::after {
+  animation: ripple 1s ease-out;
+}
+
+#snackbar {
+    visibility: hidden;
+    min-width: 250px; 
+    margin-left: -200px; 
+    background-color: #333;
+    color: #fff; 
+    border-radius: 2px; 
+    padding: 16px; 
+    position: fixed; 
+    z-index: 1; 
+    left: 50%; 
+    bottom: 30px;
+}
+
+#snackbar.show {
+    visibility: visible; 
+
+    -webkit-animation: fadein 0.5s, fadeout 0.5s 2.5s;
+    animation: fadein 0.5s, fadeout 0.5s 2.5s;
+}
+
+@-webkit-keyframes fadein {
+    from {bottom: 0; opacity: 0;} 
+    to {bottom: 30px; opacity: 1;}
+}
+
+@keyframes fadein {
+    from {bottom: 0; opacity: 0;}
+    to {bottom: 30px; opacity: 1;}
+}
+
+@-webkit-keyframes fadeout {
+    from {bottom: 30px; opacity: 1;} 
+    to {bottom: 0; opacity: 0;}
+}
+
+@keyframes fadeout {
+    from {bottom: 30px; opacity: 1;}
+    to {bottom: 0; opacity: 0;}
 }
\ No newline at end of file
diff --git a/grades.db b/grades.db
index 7605be1e..d00918ec 100644
Binary files a/grades.db and b/grades.db differ
diff --git a/disticon.png b/images/disticon.png
similarity index 100%
rename from disticon.png
rename to images/disticon.png
diff --git a/background.js b/js/background.js
similarity index 89%
rename from background.js
rename to js/background.js
index 8ebacf0f..b1d60863 100644
--- a/background.js
+++ b/js/background.js
@@ -8,7 +8,7 @@ chrome.runtime.onMessage.addListener(function(request, sender, response) {
 		}
 	}
 	else if(request.command == "isSingleConflict"){
-		isSingleConflict(request.dtarr,response);
+		isSingleConflict(request.dtarr,request.unique,response);
 	}
 	else if(request.command == "checkConflicts"){
 		checkConflicts(response);
@@ -58,16 +58,25 @@ function checkConflicts(sendResponse) {
 	});
 }
 
-function isSingleConflict(currdatearr, sendResponse){
+function isSingleConflict(currdatearr, unique, sendResponse){
 	chrome.storage.sync.get('savedCourses', function(data) {
 		var courses = data.savedCourses;
+		var conflict = false;
 		for(var i = 0; i<courses.length;i++){
 			if(isConflict(currdatearr,courses[i].datetimearr)){
-				sendResponse({isConflict:true});
-				return false;
+				conflict = true;
+				break;
 			}
 		}
-		sendResponse({isConflict:false});
+		var contains = false;
+		var i = 0;
+		while(i < courses.length && !contains){
+			if(courses[i].unique == unique){
+				contains = true;
+			}
+			i++;
+		}
+		sendResponse({isConflict:conflict,alreadyContains:contains});
 	});
 }
 
diff --git a/content.js b/js/content.js
similarity index 72%
rename from content.js
rename to js/content.js
index a15e8c1e..bd5bec05 100644
--- a/content.js
+++ b/js/content.js
@@ -1,498 +1,505 @@
-var grades;
-var rmpLink;
-var eCISLink;
-var coursename;
-var profname;
-var profinit;
-var uniquenum;
-var profurl;
-var department;
-var course_nbr;
-var datetimearr = [];
-var chart;
-var description;
-var status;
-
-const days = new Map([["M" ,"Monday"], 
-["T", "Tuesday"], ["W", "Wednesday"],["TH" ,"Thursday"], 
-["F", "Friday"]]);
-const fadetime = 150;
-const butdelay = 100;
-
-$(document).ready( function() {
-	loadDataBase();
-	//make heading and modal
-	$("table thead th:last-child").after('<th scope=col>Plus</th>');
-	var modhtml ='<div class=modal id=myModal><div class=modal-content><span class=close>×</span><div class=card><div class=cardcontainer><h2 class=title id="title">Computer Fluency (C S 302)</h2><h2 class=profname id="profname">with Bruce Porter</h2><div id="topbuttons" class=topbuttons><button class=matbut id="rateMyProf" style="background: #4CAF50;"> RMP </button><button class=matbut id="eCIS" style="background: #CDDC39;"> eCIS </button><button class=matbut id="Syllabi"> Past Syllabi </button><button class=matbut id="saveCourse" style="background: #F44336;"> Save Course +</button></div></div></div><div class=card><div class=cardcontainer style=""><ul class=description id="description" style="list-style-type:disc"></ul></div></div><div class=card ><div id="chartcontainer" class=cardcontainer><div id=chart></div></div></div></div>';
-	$("#container").prepend(modhtml);
-	$("#myModal").prepend("<div id='snackbar'>defaultmessage..</div>");
-	$('table').find('tr').each(function(){
-	    if(!($(this).find('td').hasClass("course_header")) && $(this).has('th').length == 0){
-	    	//if a course row, then add the extension button and do something if that course has been "saved"
-	    	var thisForm = this;
-	    	$(this).append('<td data-th="Plus"><input type="image" class="distButton" id="distButton" style="vertical-align: bottom; display:block;" width="20" height="20" src='+chrome.extension.getURL('disticon.png')+' /></td>');
-	    	chrome.runtime.sendMessage({command: "isSingleConflict",dtarr: getDtarr(this)}, function(response) {
-				if(response.isConflict){
-					//DO SOMETHING IF ALREADY CONTAINS
-	    			$(thisForm).find('td').each(function(){
-	    			//	$(this).css('font-weight','bold');
-	    				$(this).css('color','#F44336');
-	    				$(this).css('text-decoration','line-through');
-	    			});
-				}
-			});
-	    }
-	});
-	
-	$(".distButton").click(function(){
-		console.log("hello");
-		var row = $(this).closest('tr');
-		getCourseInfo(row);
-		getDistribution();
-	});
-
-	$("#saveCourse").click(function(){
-		var c = new Course(coursename,uniquenum, profname, datetimearr, status, profurl);
-		chrome.runtime.sendMessage({command: "courseStorage",course: c, action:$("#saveCourse").text().substring(0,$("#saveCourse").text().indexOf(" ")).toLowerCase()}, function(response) {
-			$("#saveCourse").text(response.label);
-			$("#snackbar").text(response.done);
-			$("#snackbar").attr("class","show");
-			setTimeout(function(){$("#snackbar").attr("class","");}, 3000);
-			setTimeout(update(), 1000);
-		});
-	});
-
-	$("#Syllabi").click(function(){
-		setTimeout(function(){	
-				window.open('https://utdirect.utexas.edu/apps/student/coursedocs/nlogon/?semester=&department='+department+'&course_number='+course_nbr+'&course_title=&unique=&instructor_first=&instructor_last='+profname+'&course_type=In+Residence&search=Search');
-		}, butdelay);
-	});
-	$("#rateMyProf").click(function(){
-		setTimeout(function(){
-			window.open(rmpLink);
-		}, butdelay);
-	});
-	$("#eCIS").click(function(){
-		setTimeout(function(){
-			window.open(eCISLink);
-		}, butdelay);
-	});
-	$(document).keydown(function(e) { 
-    	if (e.keyCode == 27) { 
-        	$("#myModal").fadeOut(fadetime);
-    	}
-    	$("#snackbar").attr("class",""); 
-	});
-	chrome.runtime.onMessage.addListener(
-		function(request, sender, sendResponse) {
-			if (request.command == "update"){
-				update();
-			}
-		});
-});
-
-function update(){
-	$('table').find('tr').each(function(){
-		if(!($(this).find('td').hasClass("course_header")) && $(this).has('th').length == 0){
-	    	//if a course row, then add the extension button and do something if that course has been "saved"
-	    	var thisForm = this;
-	    	chrome.runtime.sendMessage({command: "isSingleConflict",dtarr: getDtarr(this)}, function(response) {
-	    		if(response.isConflict){
-					//DO SOMETHING IF ALREADY CONTAINS
-					$(thisForm).find('td').each(function(){
-		    			//	$(this).css('font-weight','bold');
-		    			$(this).css('color','#F44336');
-		    			$(this).css('text-decoration','line-through');
-	    			});
-				} else {
-					$(thisForm).find('td').each(function(){
-		    			//	$(this).css('font-weight','bold');
-		    			$(this).css('color','black');
-		    			$(this).css('text-decoration','none');
-	    			});
-				}
-			});
-	    }
-	});
-}
-
-function getDtarr(row){
-	var numlines = $(row).find('td[data-th="Days"]>span').length;
-	var dtarr = [];
-	for(var i=0; i<numlines;i++){
-		var date = $(row).find('td[data-th="Days"]>span:eq('+i+')').text();
-		var time = $(row).find('td[data-th="Hour"]>span:eq('+i+')').text();
-		var place = $(row).find('td[data-th="Room"]>span:eq('+i+')').text();
-		console.log("DateLength: " +date.length);
-		for(var j = 0; j<date.length;j++){
-			var letter = date.charAt(j);
-			var day = "";
-			if(letter == "T" && j <date.length-1 && date.charAt(j+1) == "H"){
-				dtarr.push(["TH", convertTime(time),place]);
-			}
-			else {
-				if(letter != "H"){
-					dtarr.push([letter, convertTime(time),place]);
-				}
-			}
-		}
-	}
-	return dtarr;
-}
-
-function Course(coursename, unique, profname,datetimearr, status, link){
-	this.coursename = coursename;
-	this.unique = unique;
-	this.profname = profname;
-	this.datetimearr = datetimearr;
-	this.status = status;
-	this.link = link;
-}
-
-function getCourseInfo(row){
-	$(".dateTimePlace").remove();
-	$('table').find('tr').each(function(){
-		if($(this).find('td').hasClass("course_header")){
-			coursename = $(this).find('td').text() + "";
-		}
-		if($(this).is(row)){
-			profurl = $(this).find('td[data-th="Unique"] a').prop('href');
-		    uniquenum = $(this).find('td[data-th="Unique"]').text();
-		   	status = $(this).find('td[data-th="Status"]').text();
-			profname = $(this).find('td[data-th="Instructor"]').text().split(', ')[0];
-			profinit = $(this).find('td[data-th="Instructor"]').text().split(', ')[1];
-			if(profname.indexOf(" ") == 0){
-				profname = profname.substring(1);
-			}
-			var numlines = $(this).find('td[data-th="Days"]>span').length;
-			datetimearr = [];
-			for(var i=0; i<numlines;i++){
-				var date = $(this).find('td[data-th="Days"]>span:eq('+i+')').text();
-				var time = $(this).find('td[data-th="Hour"]>span:eq('+i+')').text();
-				var place = $(this).find('td[data-th="Room"]>span:eq('+i+')').text();
-				$("#topbuttons").before('<h2 class="dateTimePlace">'+makeLine(date,time,place)+'</th>');
-			//	makeLine(date,time,place);
-			}
-			return false;
-		}
-	});
-	if(typeof coursename == 'undefined'){
-		coursename = $("#details h2").text();
-		profinit = profinit.substring(0,1);
-		profurl = document.URL;
-	}
-	getDescription();
-	department = coursename.substring(0,coursename.search(/\d/)-2);
-	course_nbr = coursename.substring(coursename.search(/\d/),coursename.indexOf(" ",coursename.search(/\d/)));
-}
-
-//THIS CODE IS EXTREMELY MESSY, CLEAN UP GACK
-function makeLine(date, time, place){
-	var arr = [];
-	var output = "";
-	for(var i = 0; i<date.length;i++){
-		var letter = date.charAt(i);
-		var day = "";
-		if(letter == "T" && i <date.length-1 && date.charAt(i+1) == "H"){
-			arr.push(days.get("TH"));
-			datetimearr.push(["TH", convertTime(time),place]);
-		}
-		else {
-			if(letter != "H"){
-				arr.push(days.get(letter));
-				datetimearr.push([letter, convertTime(time),place]);
-			}
-		}
-	}
-	if(arr.length > 2){
-		for(var i = 0; i<arr.length;i++){
-			if(i < arr.length-1){
-				output+=arr[i]+", "
-			}
-			if(i == arr.length-2){
-				output+= "and ";
-			}
-			if(i == arr.length-1){
-				output+=arr[i];
-			}
-		}
-	}
-	else if(arr.length == 2){
-		output = arr[0]+" and "+arr[1];
-	}
-	else{
-		output+=arr[0];
-	}
-	var building = place.substring(0,place.search(/\d/)-1);
-	if(building == ""){
-		building = "Undecided Location";
-	}
-	return output + " at "+time.replace(/\./g,'').replace(/\-/g,' to ')+" in "+"<a style='font-size:medium' target='_blank' href='"+"https://maps.utexas.edu/buildings/UTM/"+building+"''>"+building+"</>";
-}
-
-function convertTime(time){
-	var converted = time.replace(/\./g,'').split("-");
-	for(var i = 0; i<2;i++){
-		converted[i] = moment(converted[i], ["h:mm A"]).format("HH:mm");
-	}
-	return converted;
-}
-function getDistribution(){
-	var query = "select * from agg";
-	query += " where dept like '%"+department+"%'";
-	query += " and prof like '%"+profname.replace(/'/g, "")+"%'";
-	query += " and course_nbr like '%"+course_nbr+"%'";
-	query += "order by a1+a2+a3+b1+b2+b3+c1+c2+c3+d1+d2+d3+f desc";
-	var res = grades.exec(query)[0];
-	var output = "";
-	openDialog(department,coursename,"aggregate",profname,res);
-}
-
-function openDialog(dep,cls,sem,professor,res){
-	$("#myModal").fadeIn(fadetime);
-	chrome.runtime.sendMessage({command: "alreadyContains",unique: uniquenum}, function(response) {
-		console.log("Already Contains: "+response.alreadyContains);
-		if(response.alreadyContains){
-			$("#saveCourse").text("Remove Course -");
-		} 
-		else{
-			$("#saveCourse").text("Add Course +");
-		}
-	});
-	var data;
-	if(typeof res == 'undefined'){
-		data = [];
-	}
-	else{
-		data = res.values[0];
-	}
-	console.log(res);
-	var title = null
-	if(profname == "" && typeof res != 'undefined'){
-		title = res.values[0][1];
-	}
-	var modal = document.getElementById('myModal');
-	var span = document.getElementsByClassName("close")[0];
-	modal.style.display = "block";
-
-	$("#title").text(prettifyTitle());
-	var color = "black";
-	if(status.includes("open")){
-		color = "#4CAF50";
-	}
-	else if(status.includes("waitlisted")){
-		color = "#FF9800"
-	}
-	else if(status.includes("closed") || status.includes("cancelled")){
-		color = "#F44336";
-	}
-	$("#title").append("<span style='color:"+color+";font-size:medium;'>"+" #"+uniquenum+"</>");
-
-	var name;
-	if(profname == ""){
-		name = "Undecided Professor ";
-	}
-	else{
-		name = profinit+". "+profname.substring(0,1)+profname.substring(1).toLowerCase();
-	}
-	$("#profname").text("with "+ name);
-
-	span.onclick = function() {
-		$("#myModal").fadeOut(200);
-		$("#snackbar").attr("class","");
-	}
-	chart = Highcharts.chart('chart', {
-		chart: {
-			type: 'column',
-			backgroundColor: ' #fefefe',
-			spacingLeft: 10
-		},
-		title: {
-			text: null
-		},
-		subtitle: {
-			text: title
-		},
-		legend: {
-			enabled: false
-		},
-		xAxis: {
-			title: {
-				text: 'Grades' 
-			},
-			categories: [
-			'A',
-			'A-',
-			'B+',
-			'B',
-			'B-', 
-			'C+', 
-			'C', 
-			'C-',
-			'D+', 
-			'D',
-			'D-',
-			'F'
-			],
-			crosshair: true
-		},
-		yAxis: {
-			min: 0,
-			title: {
-				text: 'Students'
-			}
-		},
-		credits: {
-			enabled: false
-		},
-		lang: {
-			noData: "The professor hasn't taught this class :("
-		},
-		tooltip: {
-			headerFormat: '<span style="font-size:small; font-weight:bold">{point.key}</span><table>',
-			pointFormat: '<td style="color:{black};padding:0;font-size:small; font-weight:bold;"><b>{point.y:.0f} Students</b></td>',
-			footerFormat: '</table>',
-			shared: true,
-			useHTML: true
-		},
-		plotOptions: {
-			bar: {
-				pointPadding: 0.2,
-				borderWidth: 0
-			},
-			series: {
-				animation: {
-					duration: 700
-				}
-			}
-		},
-		series: [{
-			name: 'Grades',
-			data: [{y: data[6], color: '#4CAF50'}, {y: data[7], color: '#8BC34A'}, {y: data[8], color: '#CDDC39'}, {y: data[9], color: '#FFEB3B'}, {y: data[10], color: '#FFC107'}, {y: data[11], color: '#FFA000'}, {y: data[12], color: '#F57C00'}, {y: data[13], color: '#FF5722'}, {y: data[14], color: '#FF5252'}, {y: data[15], color: '#E64A19'}, {y: data[16], color: '#F44336'}, {y: data[17], color: '#D32F2F'}]
-
-		}]
-}, function(chart) { // on complete
-	if(data.length == 0){
-		chart.renderer.text('Could not find distribution for this Instructor teaching this Course', 100, 120)
-		.css({
-			fontSize: '20px',
-			align:'center',
-			width: '300px',
-			left:'160px'
-		})
-		.add();
-		$.each(chart.series, function(i, ser) {
-			ser.hide();
-		});
-	}
-
-});	// When the user clicks anywhere outside of the modal, close it
-	window.onclick = function(event) {
-		if (event.target == modal) {
-			$("#myModal").fadeOut(fadetime);
-			$("#snackbar").attr("class",""); 
-
-		}
-	}	
-}
-
-function prettifyTitle(){
-	val = department.length+course_nbr.length+3;
-	output = coursename.substring(val).replace(/\b\w*/g, function(txt){
-		return txt.charAt(0).toUpperCase() + txt.substr(1).toLowerCase();
-	});
-	
-	return output + " ("+department+" "+course_nbr+")";	
-}
-
-function getDescription(){
-chrome.runtime.sendMessage({
-	method: "GET",
-	action: "xhttp",
-	url: profurl,
-	data: ""
-}, function(response) {
-	if(response){
-		var output="";
-		var object = $('<div/>').html(response).contents();
-		object.find('#details > p').each(function(){
-			var sentence = $(this).text();
-			if(sentence.indexOf("Prerequisite") == 0){
-				sentence = "<li style='font-weight: bold; padding: 0px 5px 5px 5px;'>"+sentence+"</li>";
-			}
-			else if(sentence.indexOf("May be") >=0 ){
-				console.log(sentence.indexOf("May be"));
-				sentence = "<li style='font-style: italic; padding: 0px 5px 5px 5px;'>"+sentence+"</li>";
-			}
-			else if(sentence.indexOf("Restricted to") == 0){
-				//console.log(sentence);
-				sentence = "<li style='color:red; padding: 0px 5px 5px 5px;'>"+sentence+"</li>";
-			}
-			else{
-				sentence= "<li  style='padding: 0px 5px 5px 5px;'>"+sentence+"</li>";
-			}
-			output+=sentence;
-			
-		});
-		description = output;
-		$("#description").animate({'opacity': 0}, 200, function(){
-			$(this).html(description).animate({'opacity': 1}, 200);    
-		});
-		var first = object.find('td[data-th="Instructor"]').text();
-		first = first.substring(first.indexOf(", "),first.indexOf(" ",first.indexOf(", ")+2));
-		first = first.substring(2);
-		rmpLink = "http://www.ratemyprofessors.com/search.jsp?queryBy=teacherName&schoolName=university+of+texas+at+austin&queryoption=HEADER&query="+first+" "+profname+";&facetSearch=true";
-		if(profname == ""){
-			eCISLink = "http://utdirect.utexas.edu/ctl/ecis/results/index.WBX?s_in_action_sw=S&s_in_search_type_sw=C&s_in_max_nbr_return=10&s_in_search_course_dept="+department+"&s_in_search_course_num="+course_nbr;
-		}
-		else{
-		eCISLink = "http://utdirect.utexas.edu/ctl/ecis/results/index.WBX?&s_in_action_sw=S&s_in_search_type_sw=N&s_in_search_name="+profname.substring(0,1)+profname.substring(1).toLowerCase()+"%2C%20"+first.substring(0,1)+first.substring(1).toLowerCase();
-	}
-	} else {
-		description = "Please Refresh the Page"
-	}
-});
-
-}
-
-function loadDataBase(){
-sql = window.SQL;
-loadBinaryFile('grades.db', function(data){
-	var sqldb = new SQL.Database(data);
-	// Database is ready
-	grades = sqldb;
-	//console.log(grades.exec(query)[0]);
-});
-}
-function loadBinaryFile(path,success) {
-var xhr = new XMLHttpRequest();
-xhr.open("GET", chrome.extension.getURL(path), true); 
-xhr.responseType = "arraybuffer";
-xhr.onload = function() {
-	var data = new Uint8Array(xhr.response);
-	var arr = new Array();
-	for(var i = 0; i != data.length; ++i) arr[i] = String.fromCharCode(data[i]);
-		success(arr.join(""));
-};
-xhr.send();
-};
-
-// function getProfessorLink(profname) {
-// 	var name = profname.split(',');
-// 	var lastname = profname[0];
-// 	var firstinit = profname[1].substring(1);
-// 	console.log(lastname + " "+firstinit);
-
-// 	return new Promise((resolve, reject) => {
-// 		chrome.runtime.sendMessage({
-// 			method: "POST",
-// 			url: "http://www.ratemyprofessors.com/search.jsp",
-// 			data: "queryBy=teacherName&schoolName=university+of+texas+at+austin&query="+profname+"&facetSearch=true"
-// 		}, function(response) {
-// 			if (response) {
-// 				console.log(response);
-// 			}
-// 		});
-// 	});
-// }
-
+var grades;
+var rmpLink;
+var eCISLink;
+var coursename;
+var profname;
+var profinit;
+var uniquenum;
+var profurl;
+var department;
+var course_nbr;
+var datetimearr = [];
+var chart;
+var description;
+var status;
+
+const days = new Map([["M" ,"Monday"], 
+	["T", "Tuesday"], ["W", "Wednesday"],["TH" ,"Thursday"], 
+	["F", "Friday"]]);
+const fadetime = 150;
+const butdelay = 100;
+
+$(document).ready( function() {
+	loadDataBase();
+	//make heading and modal
+	$("table thead th:last-child").after('<th scope=col>Plus</th>');
+	var modhtml ='<div class=modal id=myModal><div class=modal-content><span class=close>×</span><div class=card><div class=cardcontainer><h2 class=title id="title">Computer Fluency (C S 302)</h2><h2 class=profname id="profname">with Bruce Porter</h2><div id="topbuttons" class=topbuttons><button class=matbut id="rateMyProf" style="background: #4CAF50;"> RMP </button><button class=matbut id="eCIS" style="background: #CDDC39;"> eCIS </button><button class=matbut id="Syllabi"> Past Syllabi </button><button class=matbut id="saveCourse" style="background: #F44336;"> Save Course +</button></div></div></div><div class=card><div class=cardcontainer style=""><ul class=description id="description" style="list-style-type:disc"></ul></div></div><div class=card ><div id="chartcontainer" class=cardcontainer><div id=chart></div></div></div></div>';
+	$("#container").prepend(modhtml);
+	$("#myModal").prepend("<div id='snackbar'>defaultmessage..</div>");
+	$('table').find('tr').each(function(){
+		if(!($(this).find('td').hasClass("course_header")) && $(this).has('th').length == 0){
+	    	//if a course row, then add the extension button and do something if that course has been "saved"
+	    	var thisForm = this;
+	    	$(this).append('<td data-th="Plus"><input type="image" class="distButton" id="distButton" style="vertical-align: bottom; display:block;" width="20" height="20" src='+chrome.extension.getURL('images/disticon.png')+' /></td>');
+	    	var uniquenum = $(this).find('td[data-th="Unique"]').text();
+	    	console.log(uniquenum);
+	    	chrome.runtime.sendMessage({command: "isSingleConflict",dtarr: getDtarr(this),unique:uniquenum}, function(response) {
+	    		if(response.isConflict){
+					//DO SOMETHING IF ALREADY CONTAINS
+					$(thisForm).find('td').each(function(){
+		    			//	$(this).css('font-weight','bold');
+		    			$(this).css('color','#F44336');
+		    			$(this).css('text-decoration','line-through');
+		    			$(this).css('font-weight','normal');	    			
+		    		});
+				} 
+				else {
+					$(thisForm).find('td').each(function(){
+		    			//	$(this).css('font-weight','bold');
+		    			$(this).css('color','black');
+		    			$(this).css('text-decoration','none');
+		    			$(this).css('font-weight','normal');	    			
+		    		});
+				}
+				if(response.alreadyContains){
+					$(thisForm).find('td').each(function(){
+		    			//	$(this).css('font-weight','bold');
+		    			$(this).css('color','#4CAF50');
+		    			$(this).css('text-decoration','none');
+		    			$(this).css('font-weight','bold');
+		    		});
+				}
+			});
+	    }
+	});
+	
+	$(".distButton").click(function(){
+		var row = $(this).closest('tr');
+		getCourseInfo(row);
+		getDistribution();
+	});
+
+	$("#saveCourse").click(function(){
+		var c = new Course(coursename,uniquenum, profname, datetimearr, status, profurl);
+		chrome.runtime.sendMessage({command: "courseStorage",course: c, action:$("#saveCourse").text().substring(0,$("#saveCourse").text().indexOf(" ")).toLowerCase()}, function(response) {
+			$("#saveCourse").text(response.label);
+			$("#snackbar").text(response.done);
+			$("#snackbar").attr("class","show");
+			setTimeout(function(){$("#snackbar").attr("class","");}, 3000);
+			setTimeout(update(), 1000);
+		});
+	});
+
+	$("#Syllabi").click(function(){
+		setTimeout(function(){	
+			window.open('https://utdirect.utexas.edu/apps/student/coursedocs/nlogon/?semester=&department='+department+'&course_number='+course_nbr+'&course_title=&unique=&instructor_first=&instructor_last='+profname+'&course_type=In+Residence&search=Search');
+		}, butdelay);
+	});
+	$("#rateMyProf").click(function(){
+		setTimeout(function(){
+			window.open(rmpLink);
+		}, butdelay);
+	});
+	$("#eCIS").click(function(){
+		setTimeout(function(){
+			window.open(eCISLink);
+		}, butdelay);
+	});
+	$(document).keydown(function(e) { 
+		if (e.keyCode == 27) { 
+			$("#myModal").fadeOut(fadetime);
+		}
+		$("#snackbar").attr("class",""); 
+	});
+	chrome.runtime.onMessage.addListener(
+		function(request, sender, sendResponse) {
+			if (request.command == "update"){
+				update();
+			}
+		});
+});
+
+function update(){
+	$('table').find('tr').each(function(){
+		if(!($(this).find('td').hasClass("course_header")) && $(this).has('th').length == 0){
+	    	//if a course row, then add the extension button and do something if that course has been "saved"
+	    	var thisForm = this;
+	    	var uniquenum = $(this).find('td[data-th="Unique"]').text();
+	    	chrome.runtime.sendMessage({command: "isSingleConflict",dtarr: getDtarr(this),unique:uniquenum}, function(response) {
+	    		if(response.isConflict){
+					//DO SOMETHING IF ALREADY CONTAINS
+					$(thisForm).find('td').each(function(){
+		    			//	$(this).css('font-weight','bold');
+		    			$(this).css('color','#F44336');
+		    			$(this).css('text-decoration','line-through');
+		    			$(this).css('font-weight','normal');	    			
+		    		});
+				} 
+				else {
+					$(thisForm).find('td').each(function(){
+		    			//	$(this).css('font-weight','bold');
+		    			$(this).css('color','black');
+		    			$(this).css('text-decoration','none');
+		    			$(this).css('font-weight','normal');	    			
+		    		});
+				}
+				if(response.alreadyContains){
+					$(thisForm).find('td').each(function(){
+		    			//	$(this).css('font-weight','bold');
+		    			$(this).css('color','#4CAF50');
+		    			$(this).css('text-decoration','none');
+		    			$(this).css('font-weight','bold');
+		    		});
+				}
+			});
+
+	    }
+	});
+}
+
+function getDtarr(row){
+	var numlines = $(row).find('td[data-th="Days"]>span').length;
+	var dtarr = [];
+	for(var i=0; i<numlines;i++){
+		var date = $(row).find('td[data-th="Days"]>span:eq('+i+')').text();
+		var time = $(row).find('td[data-th="Hour"]>span:eq('+i+')').text();
+		var place = $(row).find('td[data-th="Room"]>span:eq('+i+')').text();
+		for(var j = 0; j<date.length;j++){
+			var letter = date.charAt(j);
+			var day = "";
+			if(letter == "T" && j <date.length-1 && date.charAt(j+1) == "H"){
+				dtarr.push(["TH", convertTime(time),place]);
+			}
+			else {
+				if(letter != "H"){
+					dtarr.push([letter, convertTime(time),place]);
+				}
+			}
+		}
+	}
+	return dtarr;
+}
+
+function Course(coursename, unique, profname,datetimearr, status, link){
+	this.coursename = coursename;
+	this.unique = unique;
+	this.profname = profname;
+	this.datetimearr = datetimearr;
+	this.status = status;
+	this.link = link;
+}
+
+function getCourseInfo(row){
+	$(".dateTimePlace").remove();
+	$('table').find('tr').each(function(){
+		if($(this).find('td').hasClass("course_header")){
+			coursename = $(this).find('td').text() + "";
+		}
+		if($(this).is(row)){
+			profurl = $(this).find('td[data-th="Unique"] a').prop('href');
+			uniquenum = $(this).find('td[data-th="Unique"]').text();
+			status = $(this).find('td[data-th="Status"]').text();
+			profname = $(this).find('td[data-th="Instructor"]').text().split(', ')[0];
+			profinit = $(this).find('td[data-th="Instructor"]').text().split(', ')[1];
+			if(profname.indexOf(" ") == 0){
+				profname = profname.substring(1);
+			}
+			var numlines = $(this).find('td[data-th="Days"]>span').length;
+			datetimearr = [];
+			for(var i=0; i<numlines;i++){
+				var date = $(this).find('td[data-th="Days"]>span:eq('+i+')').text();
+				var time = $(this).find('td[data-th="Hour"]>span:eq('+i+')').text();
+				var place = $(this).find('td[data-th="Room"]>span:eq('+i+')').text();
+				$("#topbuttons").before('<h2 class="dateTimePlace">'+makeLine(date,time,place)+'</th>');
+			//	makeLine(date,time,place);
+		}
+		return false;
+	}
+});
+	if(typeof coursename == 'undefined'){
+		coursename = $("#details h2").text();
+		profinit = profinit.substring(0,1);
+		profurl = document.URL;
+	}
+	getDescription();
+	department = coursename.substring(0,coursename.search(/\d/)-2);
+	course_nbr = coursename.substring(coursename.search(/\d/),coursename.indexOf(" ",coursename.search(/\d/)));
+}
+
+//THIS CODE IS EXTREMELY MESSY, CLEAN UP GACK
+function makeLine(date, time, place){
+	var arr = [];
+	var output = "";
+	for(var i = 0; i<date.length;i++){
+		var letter = date.charAt(i);
+		var day = "";
+		if(letter == "T" && i <date.length-1 && date.charAt(i+1) == "H"){
+			arr.push(days.get("TH"));
+			datetimearr.push(["TH", convertTime(time),place]);
+		}
+		else {
+			if(letter != "H"){
+				arr.push(days.get(letter));
+				datetimearr.push([letter, convertTime(time),place]);
+			}
+		}
+	}
+	if(arr.length > 2){
+		for(var i = 0; i<arr.length;i++){
+			if(i < arr.length-1){
+				output+=arr[i]+", "
+			}
+			if(i == arr.length-2){
+				output+= "and ";
+			}
+			if(i == arr.length-1){
+				output+=arr[i];
+			}
+		}
+	}
+	else if(arr.length == 2){
+		output = arr[0]+" and "+arr[1];
+	}
+	else{
+		output+=arr[0];
+	}
+	var building = place.substring(0,place.search(/\d/)-1);
+	if(building == ""){
+		building = "Undecided Location";
+	}
+	return output + " at "+time.replace(/\./g,'').replace(/\-/g,' to ')+" in "+"<a style='font-size:medium' target='_blank' href='"+"https://maps.utexas.edu/buildings/UTM/"+building+"''>"+building+"</>";
+}
+
+function convertTime(time){
+	var converted = time.replace(/\./g,'').split("-");
+	for(var i = 0; i<2;i++){
+		converted[i] = moment(converted[i], ["h:mm A"]).format("HH:mm");
+	}
+	return converted;
+}
+function getDistribution(){
+	var query = "select * from agg";
+	query += " where dept like '%"+department+"%'";
+	query += " and prof like '%"+profname.replace(/'/g, "")+"%'";
+	query += " and course_nbr like '%"+course_nbr+"%'";
+	query += "order by a1+a2+a3+b1+b2+b3+c1+c2+c3+d1+d2+d3+f desc";
+	var res = grades.exec(query)[0];
+	var output = "";
+	openDialog(department,coursename,"aggregate",profname,res);
+}
+
+function openDialog(dep,cls,sem,professor,res){
+	$("#myModal").fadeIn(fadetime);
+	chrome.runtime.sendMessage({command: "alreadyContains",unique: uniquenum}, function(response) {
+		if(response.alreadyContains){
+			$("#saveCourse").text("Remove Course -");
+		} 
+		else{
+			$("#saveCourse").text("Add Course +");
+		}
+	});
+	var data;
+	if(typeof res == 'undefined'){
+		data = [];
+	}
+	else{
+		data = res.values[0];
+	}
+	var title = null
+	if(profname == "" && typeof res != 'undefined'){
+		title = res.values[0][1];
+	}
+	var modal = document.getElementById('myModal');
+	var span = document.getElementsByClassName("close")[0];
+	modal.style.display = "block";
+
+	$("#title").text(prettifyTitle());
+	var color = "black";
+	if(status.includes("open")){
+		color = "#4CAF50";
+	}
+	else if(status.includes("waitlisted")){
+		color = "#FF9800"
+	}
+	else if(status.includes("closed") || status.includes("cancelled")){
+		color = "#F44336";
+	}
+	$("#title").append("<span style='color:"+color+";font-size:medium;'>"+" #"+uniquenum+"</>");
+
+	var name;
+	if(profname == ""){
+		name = "Undecided Professor ";
+	}
+	else{
+		name = profinit+". "+profname.substring(0,1)+profname.substring(1).toLowerCase();
+	}
+	$("#profname").text("with "+ name);
+
+	span.onclick = function() {
+		$("#myModal").fadeOut(200);
+		$("#snackbar").attr("class","");
+	}
+	chart = Highcharts.chart('chart', {
+		chart: {
+			type: 'column',
+			backgroundColor: ' #fefefe',
+			spacingLeft: 10
+		},
+		title: {
+			text: null
+		},
+		subtitle: {
+			text: title
+		},
+		legend: {
+			enabled: false
+		},
+		xAxis: {
+			title: {
+				text: 'Grades' 
+			},
+			categories: [
+			'A',
+			'A-',
+			'B+',
+			'B',
+			'B-', 
+			'C+', 
+			'C', 
+			'C-',
+			'D+', 
+			'D',
+			'D-',
+			'F'
+			],
+			crosshair: true
+		},
+		yAxis: {
+			min: 0,
+			title: {
+				text: 'Students'
+			}
+		},
+		credits: {
+			enabled: false
+		},
+		lang: {
+			noData: "The professor hasn't taught this class :("
+		},
+		tooltip: {
+			headerFormat: '<span style="font-size:small; font-weight:bold">{point.key}</span><table>',
+			pointFormat: '<td style="color:{black};padding:0;font-size:small; font-weight:bold;"><b>{point.y:.0f} Students</b></td>',
+			footerFormat: '</table>',
+			shared: true,
+			useHTML: true
+		},
+		plotOptions: {
+			bar: {
+				pointPadding: 0.2,
+				borderWidth: 0
+			},
+			series: {
+				animation: {
+					duration: 700
+				}
+			}
+		},
+		series: [{
+			name: 'Grades',
+			data: [{y: data[6], color: '#4CAF50'}, {y: data[7], color: '#8BC34A'}, {y: data[8], color: '#CDDC39'}, {y: data[9], color: '#FFEB3B'}, {y: data[10], color: '#FFC107'}, {y: data[11], color: '#FFA000'}, {y: data[12], color: '#F57C00'}, {y: data[13], color: '#FF5722'}, {y: data[14], color: '#FF5252'}, {y: data[15], color: '#E64A19'}, {y: data[16], color: '#F44336'}, {y: data[17], color: '#D32F2F'}]
+
+		}]
+}, function(chart) { // on complete
+	if(data.length == 0){
+		chart.renderer.text('Could not find distribution for this Instructor teaching this Course', 100, 120)
+		.css({
+			fontSize: '20px',
+			align:'center',
+			width: '300px',
+			left:'160px'
+		})
+		.add();
+		$.each(chart.series, function(i, ser) {
+			ser.hide();
+		});
+	}
+
+});	// When the user clicks anywhere outside of the modal, close it
+	window.onclick = function(event) {
+		if (event.target == modal) {
+			$("#myModal").fadeOut(fadetime);
+			$("#snackbar").attr("class",""); 
+
+		}
+	}	
+}
+
+function prettifyTitle(){
+	val = department.length+course_nbr.length+3;
+	output = coursename.substring(val).replace(/\b\w*/g, function(txt){
+		return txt.charAt(0).toUpperCase() + txt.substr(1).toLowerCase();
+	});
+	
+	return output + " ("+department+" "+course_nbr+")";	
+}
+
+function getDescription(){
+	chrome.runtime.sendMessage({
+		method: "GET",
+		action: "xhttp",
+		url: profurl,
+		data: ""
+	}, function(response) {
+		if(response){
+			var output="";
+			var object = $('<div/>').html(response).contents();
+			object.find('#details > p').each(function(){
+				var sentence = $(this).text();
+				if(sentence.indexOf("Prerequisite") == 0){
+					sentence = "<li style='font-weight: bold; padding: 0px 5px 5px 5px;'>"+sentence+"</li>";
+				}
+				else if(sentence.indexOf("May be") >=0 ){
+					sentence = "<li style='font-style: italic; padding: 0px 5px 5px 5px;'>"+sentence+"</li>";
+				}
+				else if(sentence.indexOf("Restricted to") == 0){
+				//console.log(sentence);
+				sentence = "<li style='color:red; padding: 0px 5px 5px 5px;'>"+sentence+"</li>";
+			}
+			else{
+				sentence= "<li  style='padding: 0px 5px 5px 5px;'>"+sentence+"</li>";
+			}
+			output+=sentence;
+			
+		});
+			description = output;
+			$("#description").animate({'opacity': 0}, 200, function(){
+				$(this).html(description).animate({'opacity': 1}, 200);    
+			});
+			var first = object.find('td[data-th="Instructor"]').text();
+			first = first.substring(first.indexOf(", "),first.indexOf(" ",first.indexOf(", ")+2));
+			first = first.substring(2);
+			rmpLink = "http://www.ratemyprofessors.com/search.jsp?queryBy=teacherName&schoolName=university+of+texas+at+austin&queryoption=HEADER&query="+first+" "+profname+";&facetSearch=true";
+			if(profname == ""){
+				eCISLink = "http://utdirect.utexas.edu/ctl/ecis/results/index.WBX?s_in_action_sw=S&s_in_search_type_sw=C&s_in_max_nbr_return=10&s_in_search_course_dept="+department+"&s_in_search_course_num="+course_nbr;
+			}
+			else{
+				eCISLink = "http://utdirect.utexas.edu/ctl/ecis/results/index.WBX?&s_in_action_sw=S&s_in_search_type_sw=N&s_in_search_name="+profname.substring(0,1)+profname.substring(1).toLowerCase()+"%2C%20"+first.substring(0,1)+first.substring(1).toLowerCase();
+			}
+		} else {
+			description = "Please Refresh the Page"
+		}
+	});
+
+}
+
+function loadDataBase(){
+	sql = window.SQL;
+	loadBinaryFile('grades.db', function(data){
+		var sqldb = new SQL.Database(data);
+	// Database is ready
+	grades = sqldb;
+	//console.log(grades.exec(query)[0]);
+	});
+}
+function loadBinaryFile(path,success) {
+	var xhr = new XMLHttpRequest();
+	xhr.open("GET", chrome.extension.getURL(path), true); 
+	xhr.responseType = "arraybuffer";
+	xhr.onload = function() {
+		var data = new Uint8Array(xhr.response);
+		var arr = new Array();
+		for(var i = 0; i != data.length; ++i) arr[i] = String.fromCharCode(data[i]);
+			success(arr.join(""));
+	};
+	xhr.send();
+};
\ No newline at end of file
diff --git a/highcharts.js b/js/highcharts.js
similarity index 100%
rename from highcharts.js
rename to js/highcharts.js
diff --git a/jquery-3.3.1.min.js b/js/jquery-3.3.1.min.js
similarity index 100%
rename from jquery-3.3.1.min.js
rename to js/jquery-3.3.1.min.js
diff --git a/moment.min.js b/js/moment.min.js
similarity index 100%
rename from moment.min.js
rename to js/moment.min.js
diff --git a/popup.js b/js/popup.js
similarity index 96%
rename from popup.js
rename to js/popup.js
index 2589ad85..b8978203 100644
--- a/popup.js
+++ b/js/popup.js
@@ -85,9 +85,7 @@ $(document).ready(function() {
 				}
 				updateConflicts();
 				chrome.tabs.query({active: true, currentWindow: true}, function(tabs) {
-					for(var i = 0; i<tabs.length;i++){
-						chrome.tabs.sendMessage(tabs[i].id, {command: "update"});
-					}
+						chrome.tabs.sendMessage(tabs[0].id, {command: "update"});
 				});
 			});
 		});
@@ -145,9 +143,7 @@ function makeLine(index){
 function clear(){
 	chrome.storage.sync.set({savedCourses: []});
 	chrome.tabs.query({active: true, currentWindow: true}, function(tabs) {
-		for(var i = 0; i<tabs.length;i++){
-			chrome.tabs.sendMessage(tabs[i].id, {command: "update"});
-		}
+			chrome.tabs.sendMessage(tabs[0].id, {command: "update"});
 	});
 	console.log("cleared");
 	$("#courseList").fadeOut(300,function(){
diff --git a/sql-memory-growth.js b/js/sql-memory-growth.js
similarity index 100%
rename from sql-memory-growth.js
rename to js/sql-memory-growth.js
diff --git a/manifest.json b/manifest.json
index 96f58499..f0d5ce87 100644
--- a/manifest.json
+++ b/manifest.json
@@ -8,18 +8,17 @@
   "declarativeContent",
    "storage",
    "*://*.utdirect.utexas.edu/apps/registrar/course_schedule/*",
-   "*://*.ratemyprofessors.com/*",
    "*://*.catalog.utexas.edu/ribbit/"
  ],
   "content_scripts": [{
-    "css": ["styles.css"],
-    "js": ["moment.min.js","sql-memory-growth.js","highcharts.js","jquery-3.3.1.min.js","content.js"],
+    "css": ["css/styles.css"],
+    "js": ["js/moment.min.js","js/sql-memory-growth.js","js/highcharts.js","js/jquery-3.3.1.min.js","js/content.js"],
     "matches": ["https://utdirect.utexas.edu/apps/registrar/course_schedule/*"]
   }],
   "web_accessible_resources": [
-    "grades.db","disticon.png"],
+    "grades.db","images/disticon.png"],
   "background": {
-    "scripts": ["background.js"],
+    "scripts": ["js/background.js"],
     "persistent": true
   },
   "browser_action": {
diff --git a/popup.html b/popup.html
index 6143a711..8739abb8 100644
--- a/popup.html
+++ b/popup.html
@@ -2,7 +2,7 @@
 <html>
 <head>
   <meta name="viewport" content="width=device-width, initial-scale=1">
-  <link rel="stylesheet" href="popup.css">
+  <link rel="stylesheet" href="css/popup.css">
 </head>
 <body>
   <div class="card" id="header">
@@ -15,8 +15,8 @@
   <ul id= "courseList" style="list-style-type: none;padding: 5px;"></ul>
   <h2 id="empty" style="font-weight: normal;font-size: large;margin: 60px 30px 40px 30px ;">Doesn't Look Like Anything To Me.<br>
   <span style="font-size: small;display:table;margin:0 auto;font-weight: bold">(No Courses Saved)</span><h2>
-    <script src="jquery-3.3.1.min.js"></script>
-    <script src="moment.min.js"></script>
-    <script src="popup.js"></script>
+    <script src="js/jquery-3.3.1.min.js"></script>
+    <script src="js/moment.min.js"></script>
+    <script src="js/popup.js"></script>
   </body>
   </html> 
diff --git a/todo b/todo
index 1340f5ff..f58dc2d6 100644
--- a/todo
+++ b/todo
@@ -1,8 +1,7 @@
 TODO as of 7/10/18:
 - eureka integration 
 - use maps for schedule conflict
-- update page with schedule conflict information
-
+- descriiption when not loading properly, whne need to refresh page
 CLEAN UP:
 Everything lmao 
 
@@ -45,5 +44,4 @@ FIXED/DONE as of 7/10/18:
 - FIX toast bug
 - FIX save course when no times blank
 - FIX Open popup flickering
-
-chrome.tabs.create({ 'url': 'chrome://extensions/?options=' + chrome.runtime.id });
+- update page with schedule conflict information