diff --git a/zero.Core/Api/SpacesApi.cs b/zero.Core/Api/SpacesApi.cs
index bc98a965..5bebf042 100644
--- a/zero.Core/Api/SpacesApi.cs
+++ b/zero.Core/Api/SpacesApi.cs
@@ -9,6 +9,7 @@ using System.Linq;
 using System.Threading.Tasks;
 using zero.Core.Entities;
 using zero.Core.Extensions;
+using zero.Core.Renderer;
 
 namespace zero.Core.Api
 {
@@ -40,6 +41,27 @@ namespace zero.Core.Api
     }
 
 
+    /// <inheritdoc />
+    public RendererConfig GetEditorConfig(string alias)
+    {
+      Space space = GetByAlias(alias);
+
+      if (space == null)
+      {
+        return null;
+      }
+
+      AbstractGenericRenderer renderer = Options.Renderers.FirstOrDefault(x => x.TargetType == space.Type);
+
+      if (renderer == null)
+      {
+        return null;
+      }
+
+      return renderer.Build();
+    }
+
+
     /// <inheritdoc />
     public async Task<T> GetItem<T>(string alias) where T : SpaceContent
     {
@@ -53,6 +75,19 @@ namespace zero.Core.Api
     }
 
 
+    /// <inheritdoc />
+    public async Task<T> GetItem<T>(string alias, string id) where T : SpaceContent
+    {
+      using (IAsyncDocumentSession session = Raven.OpenAsyncSession())
+      {
+        return await session.Query<SpaceContent>()
+          .Where(x => x.SpaceAlias == alias && x.Id == id)
+          .ProjectInto<T>()
+          .FirstOrDefaultAsync();
+      }
+    }
+
+
     /// <inheritdoc />
     public async Task<IList<T>> GetList<T>(string alias) where T : SpaceContent
     {
@@ -124,11 +159,21 @@ namespace zero.Core.Api
     /// </summary>
     SpaceCollection GetAll();
 
+    /// <summary>
+    /// Get editor configuration for a space
+    /// </summary>
+    RendererConfig GetEditorConfig(string alias);
+
     /// <summary>
     /// Get editor item for a space
     /// </summary>
     Task<T> GetItem<T>(string alias) where T : SpaceContent;
 
+    /// <summary>
+    /// Get editor item for a space
+    /// </summary>
+    Task<T> GetItem<T>(string alias, string id) where T : SpaceContent;
+
     /// <summary>
     /// Get all list items by space alias
     /// </summary>
diff --git a/zero.Core/Extensions/StringExtensions.cs b/zero.Core/Extensions/StringExtensions.cs
index 0533b036..e981bff8 100644
--- a/zero.Core/Extensions/StringExtensions.cs
+++ b/zero.Core/Extensions/StringExtensions.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Globalization;
+using System.Linq;
 
 namespace zero.Core.Extensions
 {
@@ -87,5 +88,22 @@ namespace zero.Core.Extensions
       }
       return input;
     }
+
+    public static string ToCamelCaseId(this string input)
+    {
+      if (String.IsNullOrEmpty(input))
+      {
+        return input;
+      }
+
+      if (input.Length < 2)
+      {
+        return input.ToLowerInvariant();
+      }
+
+      string[] parts = input.Split('.');
+
+      return String.Join(".", parts.Select(x => x.ToCamelCase()));
+    }
   }
 }
diff --git a/zero.Web/App/Components/Buttons/state-button.vue b/zero.Web/App/Components/Buttons/state-button.vue
index a7e99509..a61bb42d 100644
--- a/zero.Web/App/Components/Buttons/state-button.vue
+++ b/zero.Web/App/Components/Buttons/state-button.vue
@@ -56,7 +56,7 @@
   {
     background: var(--color-bg-mid);
     //border: 1px solid var(--color-line);
-    padding: 6px 16px;
+    padding: 10px 16px;
 
     &:first-of-type
     {
diff --git a/zero.Web/App/Components/Forms/toggle.vue b/zero.Web/App/Components/Forms/toggle.vue
index b1142351..b76334d3 100644
--- a/zero.Web/App/Components/Forms/toggle.vue
+++ b/zero.Web/App/Components/Forms/toggle.vue
@@ -90,16 +90,23 @@
       transition: all 0.2s ease;
     }
 
-    &.is-active
+    &.is-active i
     {
       background: var(--color-primary);
+      transform: translateX(18px);
+      /*background: var(--color-primary);
       border-color: transparent;
 
       i
       {
         background: var(--color-primary-fg);
         transform: translateX(18px);
-      }
+      }*/
     }
   }
+
+  /*.ui-toggle.is-disabled .ui-toggle-switch i
+  {
+    background: var(--color-bg-dark);
+  }*/
 </style>
\ No newline at end of file
diff --git a/zero.Web/App/Pages/spaces/views/editor.vue b/zero.Web/App/Pages/spaces/views/editor.vue
index 7563038f..946a024b 100644
--- a/zero.Web/App/Pages/spaces/views/editor.vue
+++ b/zero.Web/App/Pages/spaces/views/editor.vue
@@ -9,13 +9,12 @@
       </ui-dropdown>
       <ui-button :submit="true" label="@ui.save" icon="fth-check" :state="form.state" v-if="!disabled" />
     </ui-header-bar>
-    <ui-editor v-if="renderer" :config="renderer" />
+    <ui-editor v-if="renderer" :config="renderer" v-model="model" />
   </ui-form>
 </template>
 
 
 <script>
-  import Axios from 'axios';
   import SpacesApi from 'zero/resources/spaces.js';
   import UiEditor from 'zero/editor/editor';
 
@@ -27,7 +26,8 @@
     data: () => ({
       disabled: false,
       renderer: {},
-      actions: []
+      actions: [],
+      model: null
     }),
 
     computed: {
@@ -54,16 +54,17 @@
 
       onLoad(form)
       {
-        form.load(Axios.get('test/getRenderer', { params: { alias: this.$route.params.alias } })).then(response =>
+        form.load(SpacesApi.getContent(this.$route.params.alias, this.$route.params.id)).then(response =>
         {
-          this.renderer = response.data;
+          this.renderer = response.config;
+          this.model = response.model;
         });
       },
 
 
       onSubmit(form)
       {
-        
+        console.table(JSON.parse(JSON.stringify(this.model)));
       },
 
     }
diff --git a/zero.Web/App/Resources/spaces.js b/zero.Web/App/Resources/spaces.js
index 477c8ab7..0daf0fb2 100644
--- a/zero.Web/App/Resources/spaces.js
+++ b/zero.Web/App/Resources/spaces.js
@@ -20,5 +20,23 @@ export default {
     query.alias = alias;
 
     return Axios.get('spaces/getList', { params: query }).then(res => Promise.resolve(res.data));
+  },
+
+  // get space item
+  getContent(alias, contentId)
+  {
+    return Axios.get('spaces/getContent', { params: { alias, contentId } }).then(res => Promise.resolve(res.data));
+  },
+
+  // save a space item
+  save(model)
+  {
+    return Axios.post('spaces/save', model).then(res => Promise.resolve(res.data));
+  },
+
+  // deletes an item
+  delete(id)
+  {
+    return Axios.post('spaces/delete', { params: { id } }).then(res => Promise.resolve(res.data));
   }
 };
\ No newline at end of file
diff --git a/zero.Web/App/editor/editor.vue b/zero.Web/App/editor/editor.vue
index e44c0fa0..5cef3d3c 100644
--- a/zero.Web/App/editor/editor.vue
+++ b/zero.Web/App/editor/editor.vue
@@ -21,6 +21,9 @@
       config: {
         type: Object,
         required: true
+      },
+      value: {
+        type: Object
       }
     },
 
@@ -29,9 +32,7 @@
     data: () => ({
       loaded: false,
       hasTabs: false,
-      model: {
-        Addresses: []
-      },
+      model: {},
       components: []
     }),
 
@@ -50,6 +51,13 @@
           this.load();
         }
       },
+      value: {
+        deep: true,
+        handler: function (value)
+        {
+          this.model = value;
+        }
+      },
       model: {
         deep: true,
         handler: function()
diff --git a/zero.Web/Controllers/SpacesController.cs b/zero.Web/Controllers/SpacesController.cs
index 46dc672b..d2e5be94 100644
--- a/zero.Web/Controllers/SpacesController.cs
+++ b/zero.Web/Controllers/SpacesController.cs
@@ -3,7 +3,9 @@ using System.Threading.Tasks;
 using zero.Core;
 using zero.Core.Api;
 using zero.Core.Entities;
+using zero.Core.Extensions;
 using zero.Core.Identity;
+using zero.TestData;
 using zero.Web.Mapper;
 using zero.Web.Models;
 
@@ -45,5 +47,45 @@ namespace zero.Web.Controllers
     {
       return Json(await Api.GetListByQuery(alias, query));
     }
+
+
+    /// <summary>
+    /// Get list items in a space
+    /// </summary>    
+    public async Task<IActionResult> GetContent([FromQuery] string alias, [FromQuery] string contentId = null)
+    {
+      TeamMember model = new TeamMember();
+
+      if (!contentId.IsNullOrEmpty())
+      {
+        model = await Api.GetItem<TeamMember>(alias, contentId);
+      }
+
+      return Json(new SpaceContentEditModel()
+      {
+        Alias = alias,
+        Model = model,
+        Config = Api.GetEditorConfig(alias)
+      });
+    }
+
+
+    /// <summary>
+    /// Save content item
+    /// </summary>
+    public async Task<IActionResult> Save([FromBody] TeamMember model)
+    {
+      TeamMember member = await Mapper.Map(model, await Api.GetItem<TeamMember>(model.Id));
+      return Json(await Api.Save(model.SpaceAlias, model));
+    }
+
+
+    /// <summary>
+    /// Deletes a country
+    /// </summary>
+    //public async Task<IActionResult> Delete([FromQuery] string id)
+    //{
+    //  return await As<UserRole, UserRoleEditModel>(await Api.Delete(id));
+    //}
   }
 }
diff --git a/zero.Web/Models/SpaceContentEditModel.cs b/zero.Web/Models/SpaceContentEditModel.cs
new file mode 100644
index 00000000..e207464c
--- /dev/null
+++ b/zero.Web/Models/SpaceContentEditModel.cs
@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using zero.Core.Entities;
+using zero.Core.Renderer;
+
+namespace zero.Web.Models
+{
+  public class SpaceContentEditModel : EditModel
+  {
+    public string Alias { get; set; }
+
+    public SpaceContent Model { get; set; }
+
+    public RendererConfig Config { get; set; }
+  }
+}
diff --git a/zero.Web/Sass/Core/_settings.scss b/zero.Web/Sass/Core/_settings.scss
index ce434fc5..8b51fd02 100644
--- a/zero.Web/Sass/Core/_settings.scss
+++ b/zero.Web/Sass/Core/_settings.scss
@@ -2,7 +2,7 @@
 :root, .theme-light
 {
   // accent colors
-  --color-primary: #1abbaa;
+  --color-primary: #292b2c;
   --color-primary-fg: #fff;
   --color-secondary: #292b2c;
   --color-negative: #d82853; 
diff --git a/zero.Web/Startup.cs b/zero.Web/Startup.cs
index 3ee1116a..edd5a6cd 100644
--- a/zero.Web/Startup.cs
+++ b/zero.Web/Startup.cs
@@ -77,7 +77,7 @@ namespace zero.Web
 
         store.Conventions.TransformTypeCollectionNameToDocumentIdPrefix = name =>
         {
-          return DocumentConventions.DefaultTransformCollectionNameToDocumentIdPrefix(name.ToCamelCase());
+          return name.ToCamelCaseId();
         };
 
         store.Conventions.IdentityPartsSeparator = ".";