diff --git a/app/static/app/css/main.scss b/app/static/app/css/main.scss
index ed8a59213..c5eaedcf6 100644
--- a/app/static/app/css/main.scss
+++ b/app/static/app/css/main.scss
@@ -11,6 +11,12 @@ html, body, section.main, .content, #wrapper, #page-wrapper{
     margin-right: 12px;
     position: relative;
     top: -14px;
+
+    .map-view{
+        .map-type-selector{
+            top: 20px;
+        }
+    }
 }
 
 #iframe{
@@ -63,6 +69,8 @@ html, body, section.main, .content, #wrapper, #page-wrapper{
     }
 
     .navbar-top-links{
+        display: flex;
+        justify-content: flex-end;
         clear: both;
         a.dropdown-toggle{
             color: white;
diff --git a/app/static/app/js/components/TaskListItem.jsx b/app/static/app/js/components/TaskListItem.jsx
index bb783a5fe..282d81c1f 100644
--- a/app/static/app/js/components/TaskListItem.jsx
+++ b/app/static/app/js/components/TaskListItem.jsx
@@ -137,8 +137,8 @@ class TaskListItem extends React.Component {
 
       this.setAutoRefresh();
     })
-    .fail(( _, __, errorThrown) => {
-      if (errorThrown === "Not Found"){ // Don't translate this one
+    .fail((result, __, errorThrown) => {
+      if (result.status === 404 || errorThrown === "Not Found"){ // Don't translate this one
         // Assume this has been deleted
         if (this.props.onDelete) this.props.onDelete(this.state.task.id);
       }else{
diff --git a/package.json b/package.json
index 0e63a5b39..5415557c4 100644
--- a/package.json
+++ b/package.json
@@ -35,6 +35,7 @@
     "css-loader": "^0.25.0",
     "d3": "^3.5.5",
     "enzyme": "^3.3.0",
+    "cheerio": "1.0.0-rc.6",
     "enzyme-adapter-react-16": "^1.15.1",
     "exifr": "^6.0.0",
     "fbemitter": "^2.1.1",