diff --git a/packages/builder/src/components/userInterface/ComponentPropertiesPanel.svelte b/packages/builder/src/components/userInterface/ComponentPropertiesPanel.svelte
index 62a3c91c3e..8ce0a57939 100644
--- a/packages/builder/src/components/userInterface/ComponentPropertiesPanel.svelte
+++ b/packages/builder/src/components/userInterface/ComponentPropertiesPanel.svelte
@@ -71,18 +71,15 @@
      }
   }
 
-  $: console.log("COMP INSTA NEW", componentInstanceNew)
-
   const onStyleChanged = store.setComponentStyle
 
   function onPropChanged(key, value) {
-   if($store.currentFrontEndType === "page") {
+   if($store.currentFrontEndType === "page" || ($store.currentFrontEndType === "screen" && $store.currentView !== "component")) {
       store.editPageOrScreen(key, value)
-   }else if($store.currentFrontEndType === "screen" && $store.currentView !== "component") {
-      store.editPageOrScreen(key, value)
-   }else {
-      store.setComponentProp(key, value)
-    }
+      return;
+   }
+      
+    store.setComponentProp(key, value)
   }
 
   function walkProps(component, action) {
diff --git a/packages/builder/src/components/userInterface/SettingsView.svelte b/packages/builder/src/components/userInterface/SettingsView.svelte
index 76619867e3..cb6f73aae0 100644
--- a/packages/builder/src/components/userInterface/SettingsView.svelte
+++ b/packages/builder/src/components/userInterface/SettingsView.svelte
@@ -9,12 +9,13 @@
   export let componentInstance = {}
   export let onChange = () => {}
 
-  let pageScreenProps = ["name", "favicon", "description", "route"]
+  let pageScreenProps = ["title", "favicon", "description", "route"]
   
   const propExistsOnComponentDef = prop => pageScreenProps.includes(prop) || prop in componentDefinition.props
 
   function handleChange(key, data) {
-    data.target ? onChange(key, data.target.value) : onChange(key, data)
+    const value = data.target ? data.target.value : data
+    onChange(key, value)
   }
 </script>
 
diff --git a/packages/builder/src/components/userInterface/propertyCategories.js b/packages/builder/src/components/userInterface/propertyCategories.js
index 18572ea6ba..b1e329c863 100644
--- a/packages/builder/src/components/userInterface/propertyCategories.js
+++ b/packages/builder/src/components/userInterface/propertyCategories.js
@@ -11,7 +11,7 @@ export const screen = [
 ]
 
 export const page = [
-  { label: "Name", key: "name", control: Input },
+  { label: "Title", key: "title", control: Input },
   { label: "Favicon", key: "favicon", control: Input },
 ]