diff --git a/app/assets/javascripts/app/controllers/footer.js b/app/assets/javascripts/app/controllers/footer.js
index fa6157410..8124e4ebe 100644
--- a/app/assets/javascripts/app/controllers/footer.js
+++ b/app/assets/javascripts/app/controllers/footer.js
@@ -107,6 +107,10 @@ angular.module('app')
     modelManager.addItemSyncObserver("room-bar", "SN|Component", (allItems, validItems, deletedItems, source) => {
       var incomingRooms = allItems.filter((candidate) => {return candidate.area == "rooms"});
       this.rooms = _.uniq(this.rooms.concat(incomingRooms)).filter((candidate) => {return !candidate.deleted});
+
+      for(var room of this.rooms) {
+        room.hosted_url = "http://localhost:8080";
+      }
     });
 
     componentManager.registerHandler({identifier: "roomBar", areas: ["rooms", "modal"], activationHandler: (component) => {
diff --git a/app/assets/javascripts/app/models/api/item.js b/app/assets/javascripts/app/models/api/item.js
index d2f77577d..b05f94adb 100644
--- a/app/assets/javascripts/app/models/api/item.js
+++ b/app/assets/javascripts/app/models/api/item.js
@@ -84,10 +84,10 @@ class Item {
   }
 
   mapContentToLocalProperties(contentObj) {
-    this.appData = contentObj.appData;
-    if(!this.appData) {
-      this.appData = {};
+    if(contentObj.appData) {
+      this.appData = contentObj.appData;
     }
+    if(!this.appData) { this.appData = {}; }
   }
 
   createContentJSONFromProperties() {
diff --git a/app/assets/stylesheets/app/_notes.scss b/app/assets/stylesheets/app/_notes.scss
index 88fce804f..45e6cd0f0 100644
--- a/app/assets/stylesheets/app/_notes.scss
+++ b/app/assets/stylesheets/app/_notes.scss
@@ -31,11 +31,8 @@
   }
 
   #notes-menu-bar {
-    color: default;
     position: relative;
     margin-top: 14px;
-    height: auto;
-    width: auto;
   }
 
   .filter-section {
diff --git a/app/assets/stylesheets/app/_tags.scss b/app/assets/stylesheets/app/_tags.scss
index 283a0cc8e..5285e9c91 100644
--- a/app/assets/stylesheets/app/_tags.scss
+++ b/app/assets/stylesheets/app/_tags.scss
@@ -5,20 +5,20 @@
   -khtml-user-select: none;
   -webkit-user-select: none;
 
-  $tags-title-bar-height: 55px;
-
-  #tags-title-bar {
-   color: black;
-   height: $tags-title-bar-height;
-   padding-top: 14px;
-   padding-left: 12px;
-   padding-right: 12px;
-   font-size: 12px;
-   color: rgba(black, 0.8);
-  }
-
   &, #tags-content {
     background-color: #f6f6f6;
+    display: flex;
+    flex-direction: column;
+  }
+
+  #tags-title-bar {
+    color: black;
+    padding-top: 14px;
+    padding-bottom: 16px;
+    padding-left: 12px;
+    padding-right: 12px;
+    font-size: 12px;
+    color: rgba(black, 0.8);
   }
 
   #tag-add-button {
@@ -30,7 +30,12 @@
   }
 
   .scrollable {
-    height: calc(100vh - (#{$tags-title-bar-height} + #{$footer-height}));
+    height: 100%;
+  }
+
+  .infinite-scroll {
+    overflow-x: hidden;
+    height: inherit;
   }
 
   .tag {