diff --git a/css/popup.css b/css/popup.css
index ded50742..993631fb 100644
--- a/css/popup.css
+++ b/css/popup.css
@@ -25,6 +25,29 @@ body {
     min-height: 400px;
 }
 
+#courseList {
+    list-style-type: none;
+    padding: 5px;
+}
+
+#empty {
+    font-weight: normal;
+    font-size: large;
+    margin: 60px 30px 180px 30px;
+    text-align: center;
+}
+
+#empty #main {
+    margin-bottom: 5px;
+}
+
+#empty span {
+    font-size: small;
+    display: table;
+    margin: 0 auto;
+    font-weight: bold;
+}
+
 .settingsbut {
     margin-right: 2px;
     border: 0px;
@@ -85,10 +108,9 @@ i {
 }
 
 .settings {
-    position: absolute;
-    bottom: 0px;
-    right: 0px;
+    position: relative;
     display: flex;
+    float: right;
     vertical-align: middle;
     box-shadow: 0 2px 5px 0 rgba(0, 0, 0, 0.16), 0 2px 10px 0 rgba(0, 0, 0, 0.12);
     transition: 0.3s;
@@ -358,7 +380,7 @@ input[type=number]::-webkit-outer-spin-button {
 .simple-menu-option:hover {
     background-color: rgba(177, 175, 175, 0.200);
     transition-duration: 0.4s;
-    color: #FF9800;
+    /* color: #FF9800; */
 }
 
 .simple-menu-option:focus {
diff --git a/js/popup.js b/js/popup.js
index 93fc023e..0445fc7c 100644
--- a/js/popup.js
+++ b/js/popup.js
@@ -2,8 +2,8 @@ var courses;
 
 setCourseList();
 getSemesters();
-var can_remove = true;
 
+var can_remove = true;
 
 function setCourseList() {
 	$("#courseList").empty()
@@ -79,6 +79,19 @@ function formatShortenedCourseName(course) {
 	return `${department} ${number} (${course.unique})`;
 }
 
+$(document).click(function(event) {
+	$target = $(event.target);
+	
+	// If we're not clicking on search button or search popup, and popup is visible, hide it
+	if (!$target.closest('#search').length && !$target.closest('#search-popup').length && $('#search-popup').is(":visible")) {
+		hideSearchPopup();
+	}
+
+	// If we're not clicking on import/export button or imp/exp popup, and popup is visible, hide it
+	if (!$target.closest('#impexp').length && !$target.closest('#import-export-popup').length && $('#import-export-popup').is(":visible")) {
+		hideImportExportPopup();
+	}
+});
 
 $("#clear").click(function () {
 	chrome.storage.sync.set({
diff --git a/popup.html b/popup.html
index 3f24574c..cb8839d1 100644
--- a/popup.html
+++ b/popup.html
@@ -18,13 +18,13 @@
   </div>
 
   <div>
-    <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 ;text-align: center">
-      <div id="main" style="margin-bottom: 5px;">Doesn't Look Like
+    <ul id="courseList"></ul>
+    <h2 id="empty">
+      <div id="main">Doesn't Look Like
         Anything
         To Me.
       </div>
-      <span style="font-size: small;display:table;margin:0 auto;font-weight: bold">(No Courses Saved)</span>
+      <span>(No Courses Saved)</span>
     </h2>
   </div>