diff --git a/packages/builder/src/builderStore/index.js b/packages/builder/src/builderStore/index.js
index 6317640955..9a93528c33 100644
--- a/packages/builder/src/builderStore/index.js
+++ b/packages/builder/src/builderStore/index.js
@@ -1,10 +1,12 @@
 import { getStore } from "./store"
+// import { getFrontendStore } from "./store/frontend"
 import { getBackendUiStore } from "./store/backend"
 import { getAutomationStore } from "./store/automation/"
 import { getThemeStore } from "./store/theme"
 import analytics from "analytics"
 
 export const store = getStore()
+// export const store = getFrontendStore()
 export const backendUiStore = getBackendUiStore()
 export const automationStore = getAutomationStore()
 export const themeStore = getThemeStore()
diff --git a/packages/builder/src/builderStore/store/frontend.js b/packages/builder/src/builderStore/store/frontend.js
new file mode 100644
index 0000000000..8f908ac568
--- /dev/null
+++ b/packages/builder/src/builderStore/store/frontend.js
@@ -0,0 +1,483 @@
+import { writable, get } from "svelte/store"
+import { cloneDeep } from "lodash/fp"
+import {
+  createProps,
+  makePropsSafe,
+  getBuiltin,
+} from "components/userInterface/pagesParsing/createProps"
+import { getExactComponent } from "components/userInterface/pagesParsing/searchComponents"
+import { backendUiStore } from "builderStore"
+import { generate_screen_css } from "../generate_css"
+import { fetchComponentLibDefinitions } from "../loadComponentLibraries"
+import api from "../api"
+import { DEFAULT_PAGES_OBJECT } from "../../constants"
+import getNewComponentName from "../getNewComponentName"
+import analytics from "analytics"
+import {
+  getParent,
+  // saveScreenApi as _saveScreenApi,
+  generateNewIdsForComponent,
+  getComponentDefinition,
+} from "../storeUtils"
+
+const INITIAL_FRONTEND_STATE = {
+  apps: [],
+  name: "",
+  description: "",
+  pages: DEFAULT_PAGES_OBJECT,
+  mainUi: {},
+  unauthenticatedUi: {},
+  components: [],
+  currentPreviewItem: null,
+  currentComponentInfo: null,
+  currentFrontEndType: "none",
+  currentPageName: "",
+  currentComponentProps: null,
+  errors: [],
+  hasAppPackage: false,
+  libraries: null,
+  appId: "",
+}
+
+export const getFrontendStore = () => {
+  const store = writable({ ...INITIAL_FRONTEND_STATE })
+
+  store.actions = {
+    // TODO: REFACTOR
+    initialise: async pkg => {
+      const screens = await api.get("/api/screens").then(r => r.json())
+
+      const mainScreens = screens.filter(screen =>
+          screen._id.includes(pkg.pages.main._id)
+        ),
+        unauthScreens = screens.filter(screen =>
+          screen._id.includes(pkg.pages.unauthenticated._id)
+        )
+      pkg.pages = {
+        main: {
+          ...pkg.pages.main,
+          _screens: mainScreens,
+        },
+        unauthenticated: {
+          ...pkg.pages.unauthenticated,
+          _screens: unauthScreens,
+        },
+      }
+
+      // if the app has just been created
+      // we need to build the CSS and save
+      if (pkg.justCreated) {
+        for (let pageName of ["main", "unauthenticated"]) {
+          const page = pkg.pages[pageName]
+          store.actions.screens.regenerateCss(page)
+          for (let screen of page._screens) {
+            store.actions.screens.regenerateCss(screen)
+          }
+
+          await api.post(`/api/pages/${page._id}`, {
+            page: {
+              componentLibraries: pkg.application.componentLibraries,
+              ...page,
+            },
+            screens: page._screens,
+          })
+        }
+        pkg.justCreated = false
+
+        const components = await fetchComponentLibDefinitions(
+          pkg.application._id
+        )
+
+        store.update(state => ({
+          ...state,
+          libraries: pkg.application.componentLibraries,
+          components,
+          name: pkg.application.name,
+          description: pkg.application.description,
+          appId: pkg.application._id,
+          pages: pkg.pages,
+          hasAppPackage: true,
+          screens: [
+            ...Object.values(mainScreens),
+            ...Object.values(unauthScreens),
+          ],
+          builtins: [getBuiltin("##builtin/screenslot")],
+          appInstance: pkg.application.instance,
+        }))
+
+        await backendUiStore.actions.database.select(pkg.application.instance)
+      }
+    },
+    // store.setScreenType
+    selectPageOrScreen: type => {
+      store.update(state => {
+        state.currentFrontEndType = type
+
+        const pageOrScreen =
+          type === "page"
+            ? state.pages[state.currentPageName]
+            : state.pages[state.currentPageName]._screens[0]
+
+        state.currentComponentInfo = pageOrScreen ? pageOrScreen.props : null
+        state.currentPreviewItem = pageOrScreen
+        state.currentView = "detail"
+        return state
+      })
+    },
+    screens: {
+      select: screenName => {
+        store.update(state => {
+          const screen = getExactComponent(state.screens, screenName, true)
+          state.currentPreviewItem = screen
+          state.currentFrontEndType = "screen"
+          state.currentView = "detail"
+
+          store.actions.screens.regenerateCssForCurrentScreen()
+          // this.regenerateCssForCurrentScreen()
+          // regenerateCssForCurrentScreen(s)
+          const safeProps = makePropsSafe(
+            state.components[screen.props._component],
+            screen.props
+          )
+          screen.props = safeProps
+          state.currentComponentInfo = safeProps
+          return state
+        })
+      },
+      create: async screen => {
+        let savePromise
+        store.update(state => {
+          state.currentPreviewItem = screen
+          state.currentComponentInfo = screen.props
+          state.currentFrontEndType = "screen"
+
+          if (state.currentPreviewItem) {
+            store.actions.screens.regenerateCss(state.currentPreviewItem)
+          }
+
+          savePromise = store.actions.screens.save(screen)
+          return state
+        })
+
+        await savePromise
+      },
+      save: async screen => {
+        const storeContents = get(store)
+        const pageName = storeContents.currentPageName || "main"
+        const currentPage = storeContents.pages[pageName]
+        const currentPageScreens = currentPage._screens
+
+        let savePromise
+        const response = await api.post(
+          `/api/screens/${currentPage._id}`,
+          screen
+        )
+        const json = await response.json()
+
+        if (currentPageScreens.includes(screen)) return
+
+        screen._rev = json.rev
+        screen._id = json.id
+
+        const screens = [...currentPageScreens, screen]
+
+        // TODO: should carry out all server updates to screen in a single call
+        store.update(state => {
+          state.pages[pageName]._screens = screens
+          state.screens = screens
+          state.currentPreviewItem = screen
+          const safeProps = makePropsSafe(
+            state.components[screen.props._component],
+            screen.props
+          )
+          state.currentComponentInfo = safeProps
+          screen.props = safeProps
+          savePromise = store.actions.pages.save()
+          return state
+        })
+        await savePromise
+      },
+      regenerateCss: screen => {
+        screen._css = generate_screen_css([screen.props])
+      },
+      regenerateCssForCurrentScreen: () => {
+        const { currentPreviewItem } = get(store)
+        if (currentPreviewItem) {
+          store.actions.screens.regenerateCss(currentPreviewItem)
+        }
+      },
+      delete: async (screensToDelete, pageName) => {
+        let deletePromise
+
+        store.update(state => {
+          if (pageName == null) {
+            pageName = state.pages.main.name
+          }
+          for (let screenToDelete of Array.isArray(screenToDelete)
+            ? screenToDelete
+            : [screenToDelete]) {
+            state.screens = state.screens.filter(
+              screen => screen.name !== screenToDelete.name
+            )
+            // Remove screen from current page as well
+            // TODO: Should be done server side
+            state.pages[pageName]._screens = state.pages[
+              pageName
+            ]._screens.filter(scr => scr.name !== screenToDelete.name)
+            deletePromise = api.delete(
+              `/api/screens/${screenToDelete._id}/${screenToDelete._rev}`
+            )
+          }
+          return state
+        })
+        await deletePromise
+      },
+    },
+    preview: {
+      // _saveCurrentPreviewItem
+      saveSelected: () => {
+        const state = get(store)
+        state.currentFrontEndType === "page"
+          ? store.actions.pages.save()
+          : store.actions.screens.save(state.currentPreviewItem)
+      },
+      pages: {
+        select: pageName => {
+          store.update(state => {
+            const current_screens = state.pages[pageName]._screens
+
+            const currentPage = state.pages[pageName]
+
+            state.currentFrontEndType = "page"
+            state.currentView = "detail"
+            state.currentPageName = pageName
+            state.screens = Array.isArray(current_screens)
+              ? current_screens
+              : Object.values(current_screens)
+            const safeProps = makePropsSafe(
+              state.components[currentPage.props._component],
+              currentPage.props
+            )
+            state.currentComponentInfo = safeProps
+            currentPage.props = safeProps
+            state.currentPreviewItem = state.pages[pageName]
+            store.actions.screens.regenerateCssForCurrentScreen()
+
+            for (let screen of state.screens) {
+              screen._css = generate_screen_css([screen.props])
+            }
+
+            return state
+          })
+        },
+        save: async page => {
+          const storeContents = get(store)
+          const pageName = storeContents.currentPageName || "main"
+          const pageToSave = page || storeContents.pages[pageName]
+
+          // TODO: revisit. This sends down a very weird payload
+          const response = await api
+            .post(`/api/pages/${pageToSave._id}`, {
+              page: {
+                componentLibraries: storeContents.pages.componentLibraries,
+                ...pageToSave,
+              },
+              screens: pageToSave._screens,
+            })
+            .then(response => response.json())
+
+          store.update(state => {
+            state.pages[pageName]._rev = response.rev
+            return state
+          })
+        },
+      },
+      components: {
+        select: component => {
+          store.update(state => {
+            const componentDef = component._component.startsWith("##")
+              ? component
+              : state.components[component._component]
+            state.currentComponentInfo = makePropsSafe(componentDef, component)
+            state.currentView = "component"
+            return state
+          })
+        },
+        // addChildComponent
+        create: (componentToAdd, presetProps) => {
+          store.update(state => {
+            function findSlot(component_array) {
+              for (let i = 0; i < component_array.length; i += 1) {
+                if (component_array[i]._component === "##builtin/screenslot") {
+                  return true
+                }
+
+                if (component_array[i]._children) findSlot(component_array[i])
+              }
+
+              return false
+            }
+
+            if (
+              componentToAdd.startsWith("##") &&
+              findSlot(state.pages[state.currentPageName].props._children)
+            ) {
+              return state
+            }
+
+            const component = getComponentDefinition(state, componentToAdd)
+
+            const instanceId = get(backendUiStore).selectedDatabase._id
+            const instanceName = getNewComponentName(component, state)
+
+            const newComponent = createProps(
+              component,
+              {
+                ...presetProps,
+                _instanceId: instanceId,
+                _instanceName: instanceName,
+              },
+              state
+            )
+
+            const currentComponent =
+              state.components[state.currentComponentInfo._component]
+
+            const targetParent = currentComponent.children
+              ? state.currentComponentInfo
+              : getParent(
+                  state.currentPreviewItem.props,
+                  state.currentComponentInfo
+                )
+
+            // Don't continue if there's no parent
+            if (!targetParent) {
+              return state
+            }
+
+            targetParent._children = targetParent._children.concat(
+              newComponent.props
+            )
+
+            store.actions.preview.saveSelected()
+
+            state.currentView = "component"
+            state.currentComponentInfo = newComponent.props
+            analytics.captureEvent("Added Component", {
+              name: newComponent.props._component,
+            })
+            return state
+          })
+        },
+        copy: (component, cut = false) => {
+          store.update(state => {
+            const copiedComponent = cloneDeep(component)
+            state.componentToPaste = copiedComponent
+            state.componentToPaste.isCut = cut
+            if (cut) {
+              const parent = getParent(
+                state.currentPreviewItem.props,
+                component._id
+              )
+              parent._children = parent._children.filter(
+                c => c._id !== component._id
+              )
+              store.actions.components.select(parent)
+            }
+
+            return state
+          })
+        },
+        paste: (targetComponent, mode) => {
+          store.update(state => {
+            if (!state.componentToPaste) return state
+
+            const componentToPaste = cloneDeep(state.componentToPaste)
+            // retain the same ids as things may be referencing this component
+            if (componentToPaste.isCut) {
+              // in case we paste a second time
+              state.componentToPaste.isCut = false
+            } else {
+              generateNewIdsForComponent(componentToPaste, state)
+            }
+            delete componentToPaste.isCut
+
+            if (mode === "inside") {
+              targetComponent._children.push(componentToPaste)
+              return state
+            }
+
+            const parent = getParent(
+              state.currentPreviewItem.props,
+              targetComponent
+            )
+
+            const targetIndex = parent._children.indexOf(targetComponent)
+            const index = mode === "above" ? targetIndex : targetIndex + 1
+            parent._children.splice(index, 0, cloneDeep(componentToPaste))
+
+            store.actions.screens.regenerateCssForCurrentScreen()
+            store.actions.preview.saveSelected()
+            store.actions.components.select(componentToPaste)
+
+            return state
+          })
+        },
+        updateStyle: (type, name, value) => {
+          store.update(state => {
+            if (!state.currentComponentInfo._styles) {
+              state.currentComponentInfo._styles = {}
+            }
+            state.currentComponentInfo._styles[type][name] = value
+
+            store.actions.screens.regenerateCssForCurrentScreen()
+
+            // save without messing with the store
+            store.actions.preview.saveSelected()
+            return state
+          })
+        },
+        updateProp: (name, value) => {
+          store.update(state => {
+            let current_component = state.currentComponentInfo
+            current_component[name] = value
+
+            state.currentComponentInfo = current_component
+            store.actions.preview.saveSelected()
+            return state
+          })
+        },
+        findRoute: component => {
+          // Gets all the components to needed to construct a path.
+          const tempStore = get(store)
+          let pathComponents = []
+          let parent = component
+          let root = false
+          while (!root) {
+            parent = getParent(tempStore.currentPreviewItem.props, parent)
+            if (!parent) {
+              root = true
+            } else {
+              pathComponents.push(parent)
+            }
+          }
+
+          // Remove root entry since it's the screen or page layout.
+          // Reverse array since we need the correct order of the IDs
+          const reversedComponents = pathComponents.reverse().slice(1)
+
+          // Add component
+          const allComponents = [...reversedComponents, component]
+
+          // Map IDs
+          const IdList = allComponents.map(c => c._id)
+
+          // Construct ID Path:
+          const path = IdList.join("/")
+
+          return path
+        },
+      },
+    },
+  }
+}
diff --git a/packages/builder/src/builderStore/store/index.js b/packages/builder/src/builderStore/store/index.js
index 44806e09c3..5631ef00c5 100644
--- a/packages/builder/src/builderStore/store/index.js
+++ b/packages/builder/src/builderStore/store/index.js
@@ -20,7 +20,7 @@ import {
   walkProps,
   savePage as _savePage,
   saveCurrentPreviewItem as _saveCurrentPreviewItem,
-  saveScreenApi as _saveScreenApi,
+  // saveScreenApi as _saveScreenApi,
   regenerateCssForCurrentScreen,
   regenerateCssForScreen,
   generateNewIdsForComponent,
@@ -58,7 +58,7 @@ export const getStore = () => {
   store.setCurrentPage = setCurrentPage(store)
   store.createLink = createLink(store)
   store.createScreen = createScreen(store)
-  store.savePage = savePage(store)
+  // store.savePage = savePage(store)
   store.addChildComponent = addChildComponent(store)
   store.selectComponent = selectComponent(store)
   store.setComponentProp = setComponentProp(store)
@@ -66,9 +66,6 @@ export const getStore = () => {
   store.setComponentStyle = setComponentStyle(store)
   store.setScreenType = setScreenType(store)
   store.getPathToComponent = getPathToComponent(store)
-  store.addTemplatedComponent = addTemplatedComponent(store)
-  store.setMetadataProp = setMetadataProp(store)
-  store.editPageOrScreen = editPageOrScreen(store)
   store.pasteComponent = pasteComponent(store)
   store.storeComponentForCopy = storeComponentForCopy(store)
   return store
@@ -79,8 +76,12 @@ export default getStore
 const setPackage = (store, initial) => async pkg => {
   const screens = await api.get("/api/screens").then(r => r.json())
 
-  const mainScreens = screens.filter(screen => screen._id.includes(pkg.pages.main._id)),
-    unauthScreens = screens.filter(screen => screen._id.includes(pkg.pages.unauthenticated._id))
+  const mainScreens = screens.filter(screen =>
+      screen._id.includes(pkg.pages.main._id)
+    ),
+    unauthScreens = screens.filter(screen =>
+      screen._id.includes(pkg.pages.unauthenticated._id)
+    )
   pkg.pages = {
     main: {
       ...pkg.pages.main,
@@ -141,28 +142,30 @@ const saveScreen = store => async screen => {
   const currentPageScreens = currentPage._screens
 
   let savePromise
-  await api
-      .post(`/api/screens/${currentPage._id}`, screen)
-      .then(() => {
-        if (currentPageScreens.includes(screen)) return
+  const response = await api.post(`/api/screens/${currentPage._id}`, screen)
+  const json = await response.json()
 
-        const screens = [...currentPageScreens, screen]
+  if (currentPageScreens.includes(screen)) return
 
-        // TODO: should carry out all server updates to screen in a single call
-        store.update(state => {
-          state.pages[pageName]._screens = screens
-          state.screens = screens
-          state.currentPreviewItem = screen
-          const safeProps = makePropsSafe(
-              state.components[screen.props._component],
-              screen.props
-          )
-          state.currentComponentInfo = safeProps
-          screen.props = safeProps
-          savePromise = _savePage(state)
-          return state
-        })
-      })
+  screen._rev = json.rev
+  screen._id = json.id
+
+  const screens = [...currentPageScreens, screen]
+
+  // TODO: should carry out all server updates to screen in a single call
+  store.update(state => {
+    state.pages[pageName]._screens = screens
+    state.screens = screens
+    state.currentPreviewItem = screen
+    const safeProps = makePropsSafe(
+      state.components[screen.props._component],
+      screen.props
+    )
+    state.currentComponentInfo = safeProps
+    screen.props = safeProps
+    savePromise = _savePage(state)
+    return state
+  })
   await savePromise
 }
 
@@ -268,17 +271,17 @@ const deleteScreens = store => (screens, pageName = null) => {
   })
 }
 
-const savePage = store => async page => {
-  store.update(state => {
-    if (state.currentFrontEndType !== "page" || !state.currentPageName) {
-      return state
-    }
+// const savePage = store => async page => {
+//   store.update(state => {
+//     if (state.currentFrontEndType !== "page" || !state.currentPageName) {
+//       return state
+//     }
 
-    state.pages[state.currentPageName] = page
-    _savePage(state)
-    return state
-  })
-}
+//     state.pages[state.currentPageName] = page
+//     _savePage(state)
+//     return state
+//   })
+// }
 
 const setCurrentPage = store => pageName => {
   store.update(state => {
@@ -365,7 +368,7 @@ const addChildComponent = store => (componentToAdd, presetProps = {}) => {
 
     state.currentFrontEndType === "page"
       ? _savePage(state)
-      : _saveScreenApi(state.currentPreviewItem, state)
+      : saveScreen(state.currentPreviewItem)
 
     state.currentView = "component"
     state.currentComponentInfo = newComponent.props
@@ -376,26 +379,6 @@ const addChildComponent = store => (componentToAdd, presetProps = {}) => {
   })
 }
 
-/**
- * @param  {string} props - props to add, as child of current component
- */
-
-const addTemplatedComponent = store => props => {
-  store.update(state => {
-    walkProps(props, p => {
-      p._id = uuid()
-    })
-    state.currentComponentInfo._children = state.currentComponentInfo._children.concat(
-      props
-    )
-    regenerateCssForCurrentScreen(state)
-
-    _saveCurrentPreviewItem(state)
-
-    return state
-  })
-}
-
 const selectComponent = store => component => {
   store.update(state => {
     return _selectComponent(state, component)
@@ -440,6 +423,7 @@ const setComponentStyle = store => (type, name, value) => {
   })
 }
 
+// Select page or screen
 const setScreenType = store => type => {
   store.update(state => {
     state.currentFrontEndType = type
@@ -456,17 +440,6 @@ const setScreenType = store => type => {
   })
 }
 
-const editPageOrScreen = store => (key, value, setOnComponent = false) => {
-  store.update(state => {
-    setOnComponent
-      ? (state.currentPreviewItem.props[key] = value)
-      : (state.currentPreviewItem[key] = value)
-    _saveCurrentPreviewItem(state)
-
-    return state
-  })
-}
-
 const getPathToComponent = store => component => {
   // Gets all the components to needed to construct a path.
   const tempStore = get(store)
@@ -498,13 +471,6 @@ const getPathToComponent = store => component => {
   return path
 }
 
-const setMetadataProp = store => (name, prop) => {
-  store.update(s => {
-    s.currentPreviewItem[name] = prop
-    return s
-  })
-}
-
 const storeComponentForCopy = store => (component, cut = false) => {
   store.update(s => {
     const copiedComponent = cloneDeep(component)
diff --git a/packages/builder/src/builderStore/storeUtils.js b/packages/builder/src/builderStore/storeUtils.js
index 108bff0e63..3c85e611dd 100644
--- a/packages/builder/src/builderStore/storeUtils.js
+++ b/packages/builder/src/builderStore/storeUtils.js
@@ -34,17 +34,18 @@ export const getParent = (rootProps, child) => {
 export const saveCurrentPreviewItem = s =>
   s.currentFrontEndType === "page"
     ? savePage(s)
-    : saveScreenApi(s.currentPreviewItem, s)
+    : store.saveScreen(s.currentPreviewItem)
 
 export const savePage = async state => {
   const pageName = state.currentPageName || "main"
   const page = state.pages[pageName]
 
-  const response = await api.post(`/api/pages/${page._id}`, {
-    page: { componentLibraries: state.pages.componentLibraries, ...page },
-    uiFunctions: state.currentPageFunctions,
-    screens: page._screens,
-  }).then(response => response.json())
+  const response = await api
+    .post(`/api/pages/${page._id}`, {
+      page: { componentLibraries: state.pages.componentLibraries, ...page },
+      screens: page._screens,
+    })
+    .then(response => response.json())
   store.update(innerState => {
     innerState.pages[pageName]._rev = response.rev
     return innerState
@@ -52,25 +53,19 @@ export const savePage = async state => {
   return state
 }
 
-export const saveScreenApi = (screen, s) => {
-  api
-    .post(`/_builder/api/${s.appId}/pages/${s.currentPageName}/screen`, screen)
-    .then(() => savePage(s))
-}
+// export const saveScreenApi = async (screen, state) => {
+//   const currentPage = state.pages[state.currentPageName]
+//   const response = await api.post(`/api/screens/${currentPage._id}`, screen)
+//   const json = await response.json()
 
-export const renameCurrentScreen = (newname, state) => {
-  const oldname = state.currentPreviewItem.props._instanceName
-  state.currentPreviewItem.props._instanceName = newname
+//   store.update(innerState => {
+//     // TODO: need to update pages in here
+//     // innerState.pages[pageName]._rev = response.rev
+//     return innerState
+//   })
 
-  api.patch(
-    `/_builder/api/${state.appId}/pages/${state.currentPageName}/screen`,
-    {
-      oldname,
-      newname,
-    }
-  )
-  return state
-}
+//   await savePage(state)
+// }
 
 export const walkProps = (props, action, cancelToken = null) => {
   cancelToken = cancelToken || { cancelled: false }
diff --git a/packages/builder/src/components/userInterface/ScreenDropdownMenu.svelte b/packages/builder/src/components/userInterface/ScreenDropdownMenu.svelte
index 75e2483f31..9f42a9546b 100644
--- a/packages/builder/src/components/userInterface/ScreenDropdownMenu.svelte
+++ b/packages/builder/src/components/userInterface/ScreenDropdownMenu.svelte
@@ -1,6 +1,7 @@
 <script>
   import { goto } from "@sveltech/routify"
   import { store } from "builderStore"
+  import { notifier } from "builderStore/store/notifications"
   import ConfirmDialog from "components/common/ConfirmDialog.svelte"
   import { DropdownMenu } from "@budibase/bbui"
   import { DropdownContainer, DropdownItem } from "components/common/Dropdowns"
@@ -17,6 +18,7 @@
     store.update(state => {
       if (state.currentPreviewItem.name === screen.name) {
         store.setCurrentPage($store.currentPageName)
+        notifier.success(`Screen ${screen.name} deleted successfully.`)
         $goto(`./:page/page-layout`)
       }
       return state
diff --git a/packages/builder/src/components/userInterface/pagesParsing/searchComponents.js b/packages/builder/src/components/userInterface/pagesParsing/searchComponents.js
index 9979d4dcc6..84f55f50c4 100644
--- a/packages/builder/src/components/userInterface/pagesParsing/searchComponents.js
+++ b/packages/builder/src/components/userInterface/pagesParsing/searchComponents.js
@@ -29,9 +29,10 @@ export const searchAllComponents = (components, phrase) => {
 }
 
 export const getExactComponent = (components, name, isScreen = false) => {
-  return components.find(c =>
-    isScreen ? c.props._instanceName === name : c._instanceName === name
-  )
+  return components.find(comp => {
+    const { props, _instanceName } = comp
+    return name === isScreen ? props._instanceName : _instanceName
+  })
 }
 
 export const getAncestorProps = (components, name, found = []) => {
diff --git a/packages/server/src/api/controllers/application.js b/packages/server/src/api/controllers/application.js
index 8d07e52f4e..53a083db7c 100644
--- a/packages/server/src/api/controllers/application.js
+++ b/packages/server/src/api/controllers/application.js
@@ -223,7 +223,9 @@ const createEmptyAppPackage = async (ctx, app) => {
   mainPage.title = app.name
   const unauthPage = cloneDeep(UNAUTHENTICATED)
   unauthPage._id = generatePageID()
+  // TODO: fix - handlebars etc
   unauthPage.title = app.name
+  unauthPage.props._children[0]._children.title = `Log in to ${app.name}`
   const homeScreen = cloneDeep(HOME_SCREEN)
   homeScreen._id = generateScreenID(mainPage._id)
   await db.bulkDocs([mainPage, unauthPage, homeScreen])
diff --git a/packages/server/src/api/controllers/screen.js b/packages/server/src/api/controllers/screen.js
index fa7142a42a..88166bf0b2 100644
--- a/packages/server/src/api/controllers/screen.js
+++ b/packages/server/src/api/controllers/screen.js
@@ -1,8 +1,3 @@
-/**
- * This controller is not currently fully implemented. Screens are
- * currently managed as part of the pages API, please look in api/routes/page.js
- * for routes and controllers.
- */
 const CouchDB = require("../../db")
 const { getScreenParams, generateScreenID } = require("../../db/utils")
 
@@ -49,4 +44,5 @@ exports.destroy = async ctx => {
   const db = new CouchDB(ctx.user.appId)
   await db.remove(ctx.params.screenId, ctx.params.revId)
   ctx.message = "Screen deleted successfully"
+  ctx.status = 200
 }
diff --git a/packages/server/src/api/routes/index.js b/packages/server/src/api/routes/index.js
index 599edaa3e2..a19742097c 100644
--- a/packages/server/src/api/routes/index.js
+++ b/packages/server/src/api/routes/index.js
@@ -1,5 +1,5 @@
 const authRoutes = require("./auth")
-const pageRoutes = require("./pages.new")
+const pageRoutes = require("./pages")
 const screenRoutes = require("./screen")
 const userRoutes = require("./user")
 const applicationRoutes = require("./application")
diff --git a/packages/server/src/api/routes/pages.js b/packages/server/src/api/routes/pages.js
index 547f0d2eb6..1ec01dc780 100644
--- a/packages/server/src/api/routes/pages.js
+++ b/packages/server/src/api/routes/pages.js
@@ -1,108 +1,10 @@
 const Router = require("@koa/router")
-const StatusCodes = require("../../utilities/statusCodes")
-const joiValidator = require("../../middleware/joi-validator")
-const Joi = require("joi")
-const {
-  listScreens,
-  saveScreen,
-  buildPage,
-  renameScreen,
-  deleteScreen,
-} = require("../../utilities/builder")
 const authorized = require("../../middleware/authorized")
 const { BUILDER } = require("../../utilities/accessLevels")
+const controller = require("../controllers/page")
 
 const router = Router()
 
-function generateSaveValidation() {
-  // prettier-ignore
-  return joiValidator.body(Joi.object({
-    _css: Joi.string().allow(""),
-    name: Joi.string().required(),
-    route: Joi.string().required(),
-    props: Joi.object({
-      _id: Joi.string().required(),
-      _component: Joi.string().required(),
-      _children: Joi.array().required(),
-      _instanceName: Joi.string().required(),
-      _styles: Joi.object().required(),
-      type: Joi.string().optional(),
-      table: Joi.string().optional(),
-    }).required().unknown(true),
-  }).unknown(true))
-}
-
-function generatePatchValidation() {
-  return joiValidator.body(
-    Joi.object({
-      oldname: Joi.string().required(),
-      newname: Joi.string().required(),
-    }).unknown(true)
-  )
-}
-
-router.post(
-  "/_builder/api/:appId/pages/:pageName",
-  authorized(BUILDER),
-  async ctx => {
-    await buildPage(ctx.params.appId, ctx.params.pageName, ctx.request.body)
-    ctx.response.status = StatusCodes.OK
-  }
-)
-
-router.get(
-  "/_builder/api/:appId/pages/:pagename/screens",
-  authorized(BUILDER),
-  async ctx => {
-    ctx.body = await listScreens(ctx.params.appId, ctx.params.pagename)
-    ctx.response.status = StatusCodes.OK
-  }
-)
-
-router.post(
-  "/_builder/api/:appId/pages/:pagename/screen",
-  authorized(BUILDER),
-  generateSaveValidation(),
-  async ctx => {
-    ctx.body = await saveScreen(
-      ctx.config,
-      ctx.params.appId,
-      ctx.params.pagename,
-      ctx.request.body
-    )
-    ctx.response.status = StatusCodes.OK
-  }
-)
-
-router.patch(
-  "/_builder/api/:appname/pages/:pagename/screen",
-  authorized(BUILDER),
-  generatePatchValidation(),
-  async ctx => {
-    await renameScreen(
-      ctx.config,
-      ctx.params.appname,
-      ctx.params.pagename,
-      ctx.request.body.oldname,
-      ctx.request.body.newname
-    )
-    ctx.response.status = StatusCodes.OK
-  }
-)
-
-router.delete(
-  "/_builder/api/pages/:pagename/screens/:id",
-  authorized(BUILDER),
-  async ctx => {
-    await deleteScreen(
-      ctx.config,
-      ctx.user.appId,
-      ctx.params.pagename,
-      ctx.params.id
-    )
-
-    ctx.response.status = StatusCodes.OK
-  }
-)
+router.post("/api/pages/:pageId", authorized(BUILDER), controller.save)
 
 module.exports = router
diff --git a/packages/server/src/api/routes/pages.new.js b/packages/server/src/api/routes/pages.new.js
deleted file mode 100644
index 1ec01dc780..0000000000
--- a/packages/server/src/api/routes/pages.new.js
+++ /dev/null
@@ -1,10 +0,0 @@
-const Router = require("@koa/router")
-const authorized = require("../../middleware/authorized")
-const { BUILDER } = require("../../utilities/accessLevels")
-const controller = require("../controllers/page")
-
-const router = Router()
-
-router.post("/api/pages/:pageId", authorized(BUILDER), controller.save)
-
-module.exports = router
diff --git a/packages/server/src/api/routes/pages.old.js b/packages/server/src/api/routes/pages.old.js
new file mode 100644
index 0000000000..547f0d2eb6
--- /dev/null
+++ b/packages/server/src/api/routes/pages.old.js
@@ -0,0 +1,108 @@
+const Router = require("@koa/router")
+const StatusCodes = require("../../utilities/statusCodes")
+const joiValidator = require("../../middleware/joi-validator")
+const Joi = require("joi")
+const {
+  listScreens,
+  saveScreen,
+  buildPage,
+  renameScreen,
+  deleteScreen,
+} = require("../../utilities/builder")
+const authorized = require("../../middleware/authorized")
+const { BUILDER } = require("../../utilities/accessLevels")
+
+const router = Router()
+
+function generateSaveValidation() {
+  // prettier-ignore
+  return joiValidator.body(Joi.object({
+    _css: Joi.string().allow(""),
+    name: Joi.string().required(),
+    route: Joi.string().required(),
+    props: Joi.object({
+      _id: Joi.string().required(),
+      _component: Joi.string().required(),
+      _children: Joi.array().required(),
+      _instanceName: Joi.string().required(),
+      _styles: Joi.object().required(),
+      type: Joi.string().optional(),
+      table: Joi.string().optional(),
+    }).required().unknown(true),
+  }).unknown(true))
+}
+
+function generatePatchValidation() {
+  return joiValidator.body(
+    Joi.object({
+      oldname: Joi.string().required(),
+      newname: Joi.string().required(),
+    }).unknown(true)
+  )
+}
+
+router.post(
+  "/_builder/api/:appId/pages/:pageName",
+  authorized(BUILDER),
+  async ctx => {
+    await buildPage(ctx.params.appId, ctx.params.pageName, ctx.request.body)
+    ctx.response.status = StatusCodes.OK
+  }
+)
+
+router.get(
+  "/_builder/api/:appId/pages/:pagename/screens",
+  authorized(BUILDER),
+  async ctx => {
+    ctx.body = await listScreens(ctx.params.appId, ctx.params.pagename)
+    ctx.response.status = StatusCodes.OK
+  }
+)
+
+router.post(
+  "/_builder/api/:appId/pages/:pagename/screen",
+  authorized(BUILDER),
+  generateSaveValidation(),
+  async ctx => {
+    ctx.body = await saveScreen(
+      ctx.config,
+      ctx.params.appId,
+      ctx.params.pagename,
+      ctx.request.body
+    )
+    ctx.response.status = StatusCodes.OK
+  }
+)
+
+router.patch(
+  "/_builder/api/:appname/pages/:pagename/screen",
+  authorized(BUILDER),
+  generatePatchValidation(),
+  async ctx => {
+    await renameScreen(
+      ctx.config,
+      ctx.params.appname,
+      ctx.params.pagename,
+      ctx.request.body.oldname,
+      ctx.request.body.newname
+    )
+    ctx.response.status = StatusCodes.OK
+  }
+)
+
+router.delete(
+  "/_builder/api/pages/:pagename/screens/:id",
+  authorized(BUILDER),
+  async ctx => {
+    await deleteScreen(
+      ctx.config,
+      ctx.user.appId,
+      ctx.params.pagename,
+      ctx.params.id
+    )
+
+    ctx.response.status = StatusCodes.OK
+  }
+)
+
+module.exports = router
diff --git a/packages/server/src/constants/pages.js b/packages/server/src/constants/pages.js
index eb52726341..5fe74d6123 100644
--- a/packages/server/src/constants/pages.js
+++ b/packages/server/src/constants/pages.js
@@ -146,7 +146,6 @@ const MAIN = {
     className: "",
     onLoad: [],
   },
-  uiFunctions: "",
 }
 
 const UNAUTHENTICATED = {
@@ -217,7 +216,6 @@ const UNAUTHENTICATED = {
     className: "",
     onLoad: [],
   },
-  uiFunctions: "",
 }
 
 module.exports = { MAIN, UNAUTHENTICATED, PageTypes }
diff --git a/packages/server/src/utilities/appDirectoryTemplate/pages/main/page.json b/packages/server/src/utilities/appDirectoryTemplate/pages/main/page.json
index ecd63a6284..19ab2dca03 100644
--- a/packages/server/src/utilities/appDirectoryTemplate/pages/main/page.json
+++ b/packages/server/src/utilities/appDirectoryTemplate/pages/main/page.json
@@ -139,6 +139,5 @@
     "_code": "",
     "className": "",
     "onLoad": []
-  },
-  "uiFunctions": ""
+  }
 }
diff --git a/packages/server/src/utilities/appDirectoryTemplate/pages/unauthenticated/page.json b/packages/server/src/utilities/appDirectoryTemplate/pages/unauthenticated/page.json
index d3e6e55ac9..f4a195d526 100644
--- a/packages/server/src/utilities/appDirectoryTemplate/pages/unauthenticated/page.json
+++ b/packages/server/src/utilities/appDirectoryTemplate/pages/unauthenticated/page.json
@@ -63,6 +63,5 @@
     "_code": "",
     "className": "",
     "onLoad": []
-  },
-  "uiFunctions": ""
+  }
 }
diff --git a/packages/server/src/utilities/builder/buildPage.js b/packages/server/src/utilities/builder/buildPage.js
index 2071e767f4..f912195b06 100644
--- a/packages/server/src/utilities/builder/buildPage.js
+++ b/packages/server/src/utilities/builder/buildPage.js
@@ -75,10 +75,7 @@ const buildFrontendAppDefinition = async (appId, pageName, pkg) => {
 
   const filename = join(appPublicPath, "clientFrontendDefinition.js")
 
-  // TODO: weird - why
-  if (pkg.page._css) {
-    delete pkg.page._css
-  }
+  delete pkg.page._css
 
   for (let screen of pkg.screens) {
     if (screen._css) {
diff --git a/packages/server/src/utilities/builder/getPages.js b/packages/server/src/utilities/builder/getPages.js
index 2485bed419..e7d4856d0a 100644
--- a/packages/server/src/utilities/builder/getPages.js
+++ b/packages/server/src/utilities/builder/getPages.js
@@ -1,20 +1,20 @@
-const { readJSON, readdir } = require("fs-extra")
-const { join } = require("../centralPath")
+// const { readJSON, readdir } = require("fs-extra")
+// const { join } = require("../centralPath")
 
-module.exports = async appPath => {
-  const pages = {}
+// module.exports = async appPath => {
+//   const pages = {}
 
-  const pageFolders = await readdir(join(appPath, "pages"))
-  for (let pageFolder of pageFolders) {
-    try {
-      pages[pageFolder] = await readJSON(
-        join(appPath, "pages", pageFolder, "page.json")
-      )
-      pages[pageFolder].name = pageFolder
-    } catch (_) {
-      // ignore error
-    }
-  }
+//   const pageFolders = await readdir(join(appPath, "pages"))
+//   for (let pageFolder of pageFolders) {
+//     try {
+//       pages[pageFolder] = await readJSON(
+//         join(appPath, "pages", pageFolder, "page.json")
+//       )
+//       pages[pageFolder].name = pageFolder
+//     } catch (_) {
+//       // ignore error
+//     }
+//   }
 
-  return pages
-}
+//   return pages
+// }
diff --git a/packages/server/src/utilities/builder/index.js b/packages/server/src/utilities/builder/index.js
index 71da152f7b..155ad5b197 100644
--- a/packages/server/src/utilities/builder/index.js
+++ b/packages/server/src/utilities/builder/index.js
@@ -1,24 +1,24 @@
-const { appPackageFolder } = require("../createAppPackage")
-const {
-  readJSON,
-  writeJSON,
-  readdir,
-  ensureDir,
-  rename,
-  unlink,
-  rmdir,
-} = require("fs-extra")
-const { join } = require("../centralPath")
-const { dirname } = require("path")
+// const { appPackageFolder } = require("../createAppPackage")
+// const {
+//   readJSON,
+//   writeJSON,
+//   readdir,
+//   ensureDir,
+//   rename,
+//   unlink,
+//   rmdir,
+// } = require("fs-extra")
+// const { join } = require("../centralPath")
+// const { dirname } = require("path")
 
 const buildPage = require("./buildPage")
 // const getPages = require("./getPages")
-const listScreens = require("./listScreens")
-const { budibaseAppsDir } = require("../budibaseDir")
+// const listScreens = require("./listScreens")
+// const { budibaseAppsDir } = require("../budibaseDir")
 // const { budibaseAppsDir } = require("../budibaseDir")
 
 module.exports.buildPage = buildPage
-module.exports.listScreens = listScreens
+// module.exports.listScreens = listScreens
 
 // const getAppDefinition = async appPath =>
 //   await readJSON(`${appPath}/appDefinition.json`)
@@ -34,53 +34,36 @@ module.exports.listScreens = listScreens
 //   }
 // }
 
-const screenPath = (appPath, pageName, name) =>
-  join(appPath, "pages", pageName, "screens", name + ".json")
+// const screenPath = (appPath, pageName, name) =>
+//   join(appPath, "pages", pageName, "screens", name + ".json")
 
-module.exports.saveScreen = async (appId, pagename, screen) => {
-  const appPath = join(budibaseAppsDir(), appId)
-  const compPath = screenPath(appPath, pagename, screen.props._id)
+// module.exports.saveScreen = async (appId, pagename, screen) => {
+//   const appPath = join(budibaseAppsDir(), appId)
+//   const compPath = screenPath(appPath, pagename, screen.props._id)
 
-  await ensureDir(dirname(compPath))
-  if (screen._css) {
-    delete screen._css
-  }
+//   await ensureDir(dirname(compPath))
+//   if (screen._css) {
+//     delete screen._css
+//   }
 
-  await writeJSON(compPath, screen, {
-    encoding: "utf8",
-    flag: "w",
-    spaces: 2,
-  })
-  return screen
-}
+//   await writeJSON(compPath, screen, {
+//     encoding: "utf8",
+//     flag: "w",
+//     spaces: 2,
+//   })
+//   return screen
+// }
 
-module.exports.renameScreen = async (
-  config,
-  appId,
-  pagename,
-  oldName,
-  newName
-) => {
-  const appPath = join(budibaseAppsDir(), appId)
+// module.exports.deleteScreen = async (config, appId, pagename, name) => {
+//   const appPath = join(budibaseAppsDir(), appId)
+//   const componentFile = screenPath(appPath, pagename, name)
+//   await unlink(componentFile)
 
-  const oldComponentPath = screenPath(appPath, pagename, oldName)
-
-  const newComponentPath = screenPath(appPath, pagename, newName)
-
-  await ensureDir(dirname(newComponentPath))
-  await rename(oldComponentPath, newComponentPath)
-}
-
-module.exports.deleteScreen = async (config, appId, pagename, name) => {
-  const appPath = join(budibaseAppsDir(), appId)
-  const componentFile = screenPath(appPath, pagename, name)
-  await unlink(componentFile)
-
-  const dir = dirname(componentFile)
-  if ((await readdir(dir)).length === 0) {
-    await rmdir(dir)
-  }
-}
+//   const dir = dirname(componentFile)
+//   if ((await readdir(dir)).length === 0) {
+//     await rmdir(dir)
+//   }
+// }
 
 // module.exports.savePage = async (appId, pagename, page) => {
 //   const appPath = join(budibaseAppsDir(), appId)