diff --git a/packages/builder/src/builderStore/store/index.js b/packages/builder/src/builderStore/store/index.js
index 6ff081939b..806bab8c8f 100644
--- a/packages/builder/src/builderStore/store/index.js
+++ b/packages/builder/src/builderStore/store/index.js
@@ -1,7 +1,7 @@
 import { filter, cloneDeep, values } from "lodash/fp"
 import { pipe } from "components/common/core"
 import * as backendStoreActions from "./backend"
-import { writable } from "svelte/store"
+import { writable, get } from "svelte/store"
 import api from "../api"
 import { 
   DEFAULT_PAGES_OBJECT
diff --git a/packages/builder/src/pages/[application]/frontend/[page]/[screen]/_layout.svelte b/packages/builder/src/pages/[application]/frontend/[page]/[screen]/_layout.svelte
index 0110148f54..4e26ac6a7f 100644
--- a/packages/builder/src/pages/[application]/frontend/[page]/[screen]/_layout.svelte
+++ b/packages/builder/src/pages/[application]/frontend/[page]/[screen]/_layout.svelte
@@ -8,7 +8,7 @@
 
   // It's a screen, set it to that screen
   if ($params.screen !== "page-layout") {
-    store.setCurrentScreen($params.screen)
+    store.setCurrentScreen(decodeURI($params.screen))
 
     // There are leftover stuff, like IDs, so navigate the components and find the ID and select it.
     if ($leftover) {
@@ -30,6 +30,7 @@
 
   // Find Component with ID and continue
   function findComponent(ids, children) {
+    console.log(ids, children);
     // Setup stuff
     let componentToSelect
     let currentChildren = children
diff --git a/packages/builder/src/pages/[application]/frontend/_layout.svelte b/packages/builder/src/pages/[application]/frontend/_layout.svelte
index 758d4d7d8a..77a96451ef 100644
--- a/packages/builder/src/pages/[application]/frontend/_layout.svelte
+++ b/packages/builder/src/pages/[application]/frontend/_layout.svelte
@@ -8,8 +8,7 @@
   import PagesList from "components/userInterface/PagesList.svelte"
   import IconButton from "components/common/IconButton.svelte"
   import NewScreen from "components/userInterface/NewScreen.svelte"
-  import CurrentItemPreview from "components/userInterface/CurrentItemPreview.svelte"
-  import SettingsView from "components/userInterface/SettingsView.svelte"
+  import CurrentItemPreview from "components/userInterface/AppPreview"
   import PageView from "components/userInterface/PageView.svelte"
   import ComponentsPaneSwitcher from "components/userInterface/ComponentsPaneSwitcher.svelte"
   import ConfirmDialog from "components/common/ConfirmDialog.svelte"
@@ -104,7 +103,6 @@
 </div>
 
 <NewScreen bind:this={newScreenPicker} />
-<SettingsView bind:this={settingsView} />
 
 <ConfirmDialog
   bind:this={confirmDeleteDialog}
diff --git a/packages/server/api/controllers/application.js b/packages/server/api/controllers/application.js
index 59553d3f2c..fe69b0337d 100644
--- a/packages/server/api/controllers/application.js
+++ b/packages/server/api/controllers/application.js
@@ -24,6 +24,7 @@ exports.create = async function(ctx) {
   const { id, rev } = await clientDb.post({
     type: "app",
     instances: [],
+    userInstanceMap: {},
     componentLibraries: [
       "@budibase/standard-components",
       "@budibase/materialdesign-components"
diff --git a/packages/server/api/controllers/user.js b/packages/server/api/controllers/user.js
index 6164197dc2..3d03900533 100644
--- a/packages/server/api/controllers/user.js
+++ b/packages/server/api/controllers/user.js
@@ -24,6 +24,16 @@ exports.create = async function(ctx) {
     type: "user"
   });
 
+  // the clientDB needs to store a map of users against the app
+  const clientDB = new CouchDB(process.env.CLIENT_ID);
+  const app = await clientDB.get(ctx.params.appId);
+
+  app.userInstanceMap = {
+    ...app.userInstanceMap,
+    [response._id]: ctx.params.instanceId
+  }
+  await clientDb.put(app);
+
   ctx.body = {
     user: {
       id: response.id,
diff --git a/packages/server/api/routes/user.js b/packages/server/api/routes/user.js
index c12a6b194d..6b352916e4 100644
--- a/packages/server/api/routes/user.js
+++ b/packages/server/api/routes/user.js
@@ -5,7 +5,7 @@ const router = Router();
 
 router
   .get("/api/:instanceId/users", controller.fetch)
-  .post("/api/:instanceId/users", controller.create)
+  .post("/api/:appId/:instanceId/users", controller.create)
   .delete("/api/:instanceId/users/:userId", controller.destroy);
 
 module.exports = router;
\ No newline at end of file