diff --git a/assignment-client/src/audio/AudioMixer.cpp b/assignment-client/src/audio/AudioMixer.cpp
index 7f088d8183..8af4eec934 100644
--- a/assignment-client/src/audio/AudioMixer.cpp
+++ b/assignment-client/src/audio/AudioMixer.cpp
@@ -9,6 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "AudioMixer.h"
+
 #include <thread>
 
 #include <QtCore/QJsonArray>
@@ -36,8 +38,6 @@
 #include "AvatarAudioStream.h"
 #include "InjectedAudioStream.h"
 
-#include "AudioMixer.h"
-
 static const float DEFAULT_ATTENUATION_PER_DOUBLING_IN_DISTANCE = 0.5f;    // attenuation = -6dB * log2(distance)
 static const int DISABLE_STATIC_JITTER_FRAMES = -1;
 static const float DEFAULT_NOISE_MUTING_THRESHOLD = 1.0f;
diff --git a/assignment-client/src/audio/AudioMixer.h b/assignment-client/src/audio/AudioMixer.h
index ed3a5b0541..8c47893aa3 100644
--- a/assignment-client/src/audio/AudioMixer.h
+++ b/assignment-client/src/audio/AudioMixer.h
@@ -18,6 +18,8 @@
 #include <ThreadedAssignment.h>
 #include <UUIDHasher.h>
 
+#include <plugins/Forward.h>
+
 #include "AudioMixerStats.h"
 #include "AudioMixerSlavePool.h"
 
diff --git a/assignment-client/src/audio/AudioMixerClientData.cpp b/assignment-client/src/audio/AudioMixerClientData.cpp
index 2560f43337..d4d4f847ee 100644
--- a/assignment-client/src/audio/AudioMixerClientData.cpp
+++ b/assignment-client/src/audio/AudioMixerClientData.cpp
@@ -9,6 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "AudioMixerClientData.h"
+
 #include <random>
 
 #include <QtCore/QDebug>
@@ -22,8 +24,6 @@
 #include "AudioLogging.h"
 #include "AudioHelpers.h"
 #include "AudioMixer.h"
-#include "AudioMixerClientData.h"
-
 
 AudioMixerClientData::AudioMixerClientData(const QUuid& nodeID) :
     NodeData(nodeID),
diff --git a/assignment-client/src/audio/AudioMixerClientData.h b/assignment-client/src/audio/AudioMixerClientData.h
index c3a31715ea..514e1c9756 100644
--- a/assignment-client/src/audio/AudioMixerClientData.h
+++ b/assignment-client/src/audio/AudioMixerClientData.h
@@ -21,6 +21,7 @@
 #include <AudioLimiter.h>
 #include <UUIDHasher.h>
 
+#include <plugins/Forward.h>
 #include <plugins/CodecPlugin.h>
 
 #include "PositionalAudioStream.h"
diff --git a/assignment-client/src/audio/AudioMixerSlave.cpp b/assignment-client/src/audio/AudioMixerSlave.cpp
index abc2f7220d..b975ba8bfe 100644
--- a/assignment-client/src/audio/AudioMixerSlave.cpp
+++ b/assignment-client/src/audio/AudioMixerSlave.cpp
@@ -9,6 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "AudioMixerSlave.h"
+
 #include <algorithm>
 
 #include <glm/glm.hpp>
@@ -34,8 +36,6 @@
 #include "InjectedAudioStream.h"
 #include "AudioHelpers.h"
 
-#include "AudioMixerSlave.h"
-
 using AudioStreamMap = AudioMixerClientData::AudioStreamMap;
 
 // packet helpers
diff --git a/interface/resources/qml/hifi/dialogs/TabletAssetServer.qml b/interface/resources/qml/hifi/dialogs/TabletAssetServer.qml
index 049a7faad8..bbecb9e85b 100644
--- a/interface/resources/qml/hifi/dialogs/TabletAssetServer.qml
+++ b/interface/resources/qml/hifi/dialogs/TabletAssetServer.qml
@@ -199,7 +199,7 @@ Rectangle {
             var SHAPE_TYPE_BOX = 4;
             var SHAPE_TYPE_SPHERE = 5;
         
-            var SHAPE_TYPES = [];ww
+            var SHAPE_TYPES = [];
             SHAPE_TYPES[SHAPE_TYPE_NONE] = "No Collision";
             SHAPE_TYPES[SHAPE_TYPE_SIMPLE_HULL] = "Basic - Whole model";
             SHAPE_TYPES[SHAPE_TYPE_SIMPLE_COMPOUND] = "Good - Sub-meshes";
diff --git a/interface/resources/qml/hifi/tablet/EditTabView.qml b/interface/resources/qml/hifi/tablet/EditTabView.qml
index c79c05a601..e419b04848 100644
--- a/interface/resources/qml/hifi/tablet/EditTabView.qml
+++ b/interface/resources/qml/hifi/tablet/EditTabView.qml
@@ -1,5 +1,6 @@
 import QtQuick 2.5
 import QtQuick.Controls 1.4
+import QtQuick.Controls 2.2 // Need both for short-term fix
 import QtWebEngine 1.1
 import QtWebChannel 1.0
 import QtQuick.Controls.Styles 1.4
@@ -10,6 +11,7 @@ import "../../controls-uit" as HifiControls
 import "../../styles-uit"
 
 
+
 TabView {
     id: editTabView
     // anchors.fill: parent
@@ -23,8 +25,27 @@ TabView {
 
         Rectangle {
             color: "#404040"
+            id: container
+
+            Flickable {
+            height: parent.height
+            width: parent.width
+
+            contentHeight: createEntitiesFlow.height +  importButton.height + assetServerButton.height +
+                           header.anchors.topMargin + createEntitiesFlow.anchors.topMargin +
+                           assetServerButton.anchors.topMargin + importButton.anchors.topMargin
+            contentWidth: width
+
+            ScrollBar.vertical : ScrollBar {
+                visible: parent.contentHeight > parent.height
+                width: 20
+                background: Rectangle {
+                    color: hifi.colors.tableScrollBackgroundDark
+                }
+            }
 
             Text {
+                id: header
                 color: "#ffffff"
                 text: "Choose an Entity Type to Create:"
                 font.pixelSize: 14
@@ -176,6 +197,7 @@ TabView {
             }
 
             HifiControls.Button {
+                id: importButton
                 text: "Import Entities (.json)"
                 color: hifi.buttons.black
                 colorScheme: hifi.colorSchemes.dark
@@ -192,6 +214,7 @@ TabView {
                 }
             }
         }
+      } // Flickable
     }
 
     Tab {