From 0312a3c9109b8deb8b294c39a18cb07dd3a65460 Mon Sep 17 00:00:00 2001
From: Michael Shanks <mike@budibase.com>
Date: Wed, 1 Jul 2020 16:44:24 +0100
Subject: [PATCH 1/2] fix: routing broken when naving to scereen with spaces

---
 .../[application]/frontend/[page]/[screen]/_layout.svelte     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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 f35626a1f5..b9bed2866a 100644
--- a/packages/builder/src/pages/[application]/frontend/[page]/[screen]/_layout.svelte
+++ b/packages/builder/src/pages/[application]/frontend/[page]/[screen]/_layout.svelte
@@ -14,7 +14,9 @@
     if ($leftover) {
       // Get the correct screen children.
       const screenChildren = $store.pages[$params.page]._screens.find(
-        screen => screen.props._instanceName === $params.screen
+        screen => 
+          (screen.props._instanceName === $params.screen 
+          || screen.props._instanceName === decodeURIComponent($params.screen))
       ).props._children
       findComponent(componentIds, screenChildren)
     }

From 29327e4d291427ae1564f7d11a53fb2dc7f6187c Mon Sep 17 00:00:00 2001
From: Michael Shanks <mike@budibase.com>
Date: Wed, 1 Jul 2020 20:46:28 +0100
Subject: [PATCH 2/2] create workflow button broken

---
 .../workflow/WorkflowPanel/WorkflowList/WorkflowList.svelte     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/builder/src/components/workflow/WorkflowPanel/WorkflowList/WorkflowList.svelte b/packages/builder/src/components/workflow/WorkflowPanel/WorkflowList/WorkflowList.svelte
index b9f0da657b..229103657c 100644
--- a/packages/builder/src/components/workflow/WorkflowPanel/WorkflowList/WorkflowList.svelte
+++ b/packages/builder/src/components/workflow/WorkflowPanel/WorkflowList/WorkflowList.svelte
@@ -28,7 +28,7 @@
 </script>
 
 <section>
-  <Button purple wide on:click{newWorkflow}>Create New Workflow</Button>
+  <Button purple wide on:click={newWorkflow}>Create New Workflow</Button>
   <ul>
     {#each $workflowStore.workflows as workflow}
       <li