diff --git a/zero.Core/Api/SpacesApi.cs b/zero.Core/Api/SpacesApi.cs
index e11065d8..e19dbc28 100644
--- a/zero.Core/Api/SpacesApi.cs
+++ b/zero.Core/Api/SpacesApi.cs
@@ -11,7 +11,6 @@ using zero.Core.Entities;
 using zero.Core.Extensions;
 using zero.Core.Options;
 using zero.Core.Plugins;
-using zero.Core.Renderer;
 
 namespace zero.Core.Api
 {
@@ -46,27 +45,6 @@ namespace zero.Core.Api
     }
 
 
-    /// <inheritdoc />
-    public RendererConfig GetEditorConfig(string alias)
-    {
-      Space space = GetByAlias(alias);
-
-      if (space == null)
-      {
-        return null;
-      }
-
-      AbstractGenericRenderer renderer = Options.Renderers.GetAllItems().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
     {
@@ -125,7 +103,7 @@ namespace zero.Core.Api
     public async Task<EntityResult<T>> Save<T>(string alias, T model) where T : SpaceContent
     {
       Space space = GetByAlias(alias);
-      RendererConfig config = GetEditorConfig(alias); 
+      //RendererConfig config = GetEditorConfig(alias); 
 
       //if (config.Validator != null)
       //{
@@ -190,11 +168,6 @@ namespace zero.Core.Api
     /// </summary>
     IReadOnlyCollection<Space> GetAll();
 
-    /// <summary>
-    /// Get editor configuration for a space
-    /// </summary>
-    RendererConfig GetEditorConfig(string alias);
-
     /// <summary>
     /// Get editor item for a space
     /// </summary>
diff --git a/zero.Core/Api/UserApi.cs b/zero.Core/Api/UserApi.cs
index c892aa8b..aeba05f6 100644
--- a/zero.Core/Api/UserApi.cs
+++ b/zero.Core/Api/UserApi.cs
@@ -1,49 +1,46 @@
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Identity;
+using Microsoft.AspNetCore.Identity;
 using Raven.Client.Documents;
 using Raven.Client.Documents.Session;
 using System.Collections.Generic;
 using System.Linq;
-using System.Security.Claims;
 using System.Threading.Tasks;
 using zero.Core.Entities;
 using zero.Core.Extensions;
-using zero.Core.Identity;
 
 namespace zero.Core.Api
 {
-  public class UserApi : AppAwareBackofficeApi, IUserApi
+  public class UserApi<T> : AppAwareBackofficeApi, IUserApi<T> where T : class, IUser
   {
-    protected UserManager<User> UserManager { get; private set; }
+    protected UserManager<T> UserManager { get; private set; }
 
-    public UserApi(IBackofficeStore store, UserManager<User> userManager) : base(store)
+    public UserApi(IBackofficeStore store, UserManager<T> userManager) : base(store)
     {
       UserManager = userManager;
     }
 
 
     /// <inheritdoc />
-    public async Task<User> GetUserById(string id)
+    public async Task<T> GetUserById(string id)
     {
-      User user = await UserManager.FindByIdAsync(id);
+      T user = await UserManager.FindByIdAsync(id);
       return user;
     }
 
 
     /// <inheritdoc />
-    public async Task<User> GetUserByEmail(string email)
+    public async Task<T> GetUserByEmail(string email)
     {
-      User user = await UserManager.FindByEmailAsync(email);
+      T user = await UserManager.FindByEmailAsync(email);
       return user;
     }
 
 
     /// <inheritdoc />
-    public async Task<IList<User>> GetAll(string appId = null)
+    public async Task<IList<T>> GetAll(string appId = null)
     {
       using (IAsyncDocumentSession session = Raven.OpenAsyncSession())
       {
-        return await session.Query<User>()
+        return await session.Query<T>()
           .Scope(appId)
           .OrderByDescending(x => x.CreatedDate)
           .ToListAsync();
@@ -52,13 +49,13 @@ namespace zero.Core.Api
 
 
     /// <inheritdoc />
-    public async Task<ListResult<User>> GetByQuery(ListQuery<User> query, string appId = null)
+    public async Task<ListResult<T>> GetByQuery(ListQuery<T> query, string appId = null)
     {
       query.SearchSelector = user => user.Name;
 
       using (IAsyncDocumentSession session = Raven.OpenAsyncSession())
       {
-        return await session.Query<User>()
+        return await session.Query<T>()
           .Scope(appId)
           .ToQueriedListAsync(query);
       }
@@ -66,37 +63,37 @@ namespace zero.Core.Api
 
 
     /// <inheritdoc />
-    public async Task<EntityResult<User>> Save(User model)
+    public async Task<EntityResult<T>> Save(T model)
     {
       return await SaveModel(model); //, new UserValidator<User>());
     }
 
 
     /// <inheritdoc />
-    public async Task<EntityResult<User>> Delete(string id)
+    public async Task<EntityResult<T>> Delete(string id)
     {
-      return await DeleteById<User>(id);
+      return await DeleteById<T>(id);
     }
 
 
     /// <inheritdoc />
-    public async Task<EntityResult<User>> UpdatePassword(User user, string currentPassword, string newPassword)
+    public async Task<EntityResult<T>> UpdatePassword(T user, string currentPassword, string newPassword)
     {
       if (currentPassword.IsNullOrWhiteSpace() || newPassword.IsNullOrWhiteSpace())
       {
-        return EntityResult<User>.Fail(nameof(currentPassword), "@errors.changepassword.emptyfields");
+        return EntityResult<T>.Fail(nameof(currentPassword), "@errors.changepassword.emptyfields");
       }
 
       if (user == null)
       {
-        return EntityResult<User>.Fail("@errors.changepassword.nouser");
+        return EntityResult<T>.Fail("@errors.changepassword.nouser");
       }
 
       IdentityResult identityResult = await UserManager.ChangePasswordAsync(user, currentPassword, newPassword);
 
       if (!identityResult.Succeeded)
       {
-        EntityResult<User> result = EntityResult<User>.Fail();
+        EntityResult<T> result = EntityResult<T>.Fail();
         
         foreach (IdentityError error in identityResult.Errors)
         {
@@ -106,19 +103,19 @@ namespace zero.Core.Api
         return result;
       }
 
-      return EntityResult<User>.Success(user);
+      return EntityResult<T>.Success(user);
     }
 
 
     /// <inheritdoc />
-    public async Task<EntityResult<User>> Enable(User user)
+    public async Task<EntityResult<T>> Enable(T user)
     {
       return await UpdateActiveState(user, true);
     }
 
 
     /// <inheritdoc />
-    public async Task<EntityResult<User>> Disable(User user)
+    public async Task<EntityResult<T>> Disable(T user)
     {
       return await UpdateActiveState(user, false);
     }
@@ -128,7 +125,7 @@ namespace zero.Core.Api
     /// Updates the active state of user.
     /// If IsActive=false, the user cannot login anymore
     /// </summary>
-    async Task<EntityResult<User>> UpdateActiveState(User user, bool isActive)
+    async Task<EntityResult<T>> UpdateActiveState(T user, bool isActive)
     {
       user.IsActive = isActive;
 
@@ -136,7 +133,7 @@ namespace zero.Core.Api
 
       if (!identityResult.Succeeded)
       {
-        EntityResult<User> result = EntityResult<User>.Fail();
+        EntityResult<T> result = EntityResult<T>.Fail();
 
         foreach (IdentityError error in identityResult.Errors)
         {
@@ -148,57 +145,57 @@ namespace zero.Core.Api
 
       await UserManager.UpdateSecurityStampAsync(user);
 
-      return EntityResult<User>.Success(user);
+      return EntityResult<T>.Success(user);
     }
   }
 
 
-  public interface IUserApi : IAppAwareBackofficeApi
+  public interface IUserApi<T> : IAppAwareBackofficeApi where T : class, IUser
   {
     /// <summary>
     /// Find user by id
     /// </summary>
-    Task<User> GetUserById(string id);
+    Task<T> GetUserById(string id);
 
     /// <summary>
     /// Find user by email
     /// </summary>
-    Task<User> GetUserByEmail(string email);  
+    Task<T> GetUserByEmail(string email);  
 
     /// <summary>
     /// Get all users for the selected application
     /// </summary>
-    Task<IList<User>> GetAll(string appId = null);
+    Task<IList<T>> GetAll(string appId = null);
 
     /// <summary>
     /// Get all available users (with query)
     /// </summary>
-    Task<ListResult<User>> GetByQuery(ListQuery<User> query, string appId = null);
+    Task<ListResult<T>> GetByQuery(ListQuery<T> query, string appId = null);
 
     /// <summary>
     /// Creates or updates a user
     /// </summary>
-    Task<EntityResult<User>> Save(User model);
+    Task<EntityResult<T>> Save(T model);
 
     /// <summary>
     /// Deletes a user
     /// </summary>
-    Task<EntityResult<User>> Delete(string id);
+    Task<EntityResult<T>> Delete(string id);
 
     /// <summary>
     /// Changes the password of the current user.
     /// User is logged out if this operation succeeds.
     /// </summary>
-    Task<EntityResult<User>> UpdatePassword(User user, string currentPassword, string newPassword);
+    Task<EntityResult<T>> UpdatePassword(T user, string currentPassword, string newPassword);
 
     /// <summary>
     /// Enables a user
     /// </summary>
-    Task<EntityResult<User>> Enable(User user);
+    Task<EntityResult<T>> Enable(T user);
 
     /// <summary>
     /// Disables a user
     /// </summary>
-    Task<EntityResult<User>> Disable(User user);
+    Task<EntityResult<T>> Disable(T user);
   }
 }
diff --git a/zero.Core/Entities/User/User.cs b/zero.Core/Entities/User/User.cs
index 52b6a6d6..118ffb0e 100644
--- a/zero.Core/Entities/User/User.cs
+++ b/zero.Core/Entities/User/User.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using zero.Core.Attributes;
 
 namespace zero.Core.Entities
 {
@@ -72,7 +73,7 @@ namespace zero.Core.Entities
   }
 
 
-
+  [Collection("Users")]
   public interface IUser : IZeroEntity, IAppAwareEntity, IZeroDbConventions
   {
     /// <summary>
diff --git a/zero.Core/EntityMap.cs b/zero.Core/EntityMap.cs
deleted file mode 100644
index b1603502..00000000
--- a/zero.Core/EntityMap.cs
+++ /dev/null
@@ -1,66 +0,0 @@
-using FluentValidation;
-using System;
-using System.Collections.Generic;
-using System.Text;
-using zero.Core.Renderer;
-
-namespace zero.Core
-{
-  public static class EntityMap
-  {
-    static Dictionary<Type, Type> Types = new Dictionary<Type, Type>();
-
-    public static void Use<TService, TImplementation>() where TImplementation : TService
-    {
-      Types[typeof(TService)] = typeof(TImplementation);
-    }
-
-
-    public static Type Get<T>() => Get(typeof(T));
-
-
-    public static Type Get(Type type)
-    {
-      if (!Types.ContainsKey(type))
-      {
-        return null;
-      }
-
-      return Types[type];
-    }
-  }
-
-
-  public class EntityDefinition<TService, TImplementation> where TImplementation : TService
-  {
-    public Type ServiceType => typeof(TService);
-
-    public Type ImplementationType => typeof(TImplementation);
-
-    public IList<IValidator> Validators { get; set; } = new List<IValidator>();
-
-    public AbstractRenderer<TImplementation> Renderer { get; set; }
-  }
-
-  public class EntityDefinition
-  {
-    public Type ServiceType { get; protected set; }
-
-    public Type ImplementationType { get; protected set; }
-
-    public IList<IValidator> Validators { get; set; } = new List<IValidator>();
-
-    public AbstractGenericRenderer Renderer { get; set; }
-
-    public static EntityDefinition Convert<TService, TImplementation>(EntityDefinition<TService, TImplementation> definition) where TImplementation : TService
-    {
-      return new EntityDefinition()
-      {
-        ServiceType = definition.ServiceType,
-        ImplementationType = definition.ImplementationType,
-        Validators = definition.Validators,
-        Renderer = definition.Renderer.ToGenericRenderer()
-      };
-    }
-  }
-}
diff --git a/zero.Core/Options/RendererOptions.cs b/zero.Core/Options/RendererOptions.cs
deleted file mode 100644
index 4657c4d9..00000000
--- a/zero.Core/Options/RendererOptions.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using zero.Core.Renderer;
-
-namespace zero.Core.Options
-{
-  public class RendererOptions : ZeroBackofficeCollection<AbstractGenericRenderer>, IZeroCollectionOptions
-  {
-    public RendererOptions()
-    {
-      
-    }
-
-
-    public void Add<TRenderer>() where TRenderer : IRenderer, new()
-    {
-      Items.Add(new TRenderer().ToGenericRenderer());
-    }
-
-
-    public void Add<TRenderer>(TRenderer renderer) where TRenderer : IRenderer, new()
-    {
-      Items.Add(renderer.ToGenericRenderer());
-    }
-  }
-}
diff --git a/zero.Core/Options/ZeroOptions.cs b/zero.Core/Options/ZeroOptions.cs
index 611bd3f9..24377353 100644
--- a/zero.Core/Options/ZeroOptions.cs
+++ b/zero.Core/Options/ZeroOptions.cs
@@ -18,7 +18,6 @@ namespace zero.Core.Options
       Features = new FeatureOptions();
       Pages = new PageOptions();
       Permissions = new PermissionOptions();
-      Renderers = new RendererOptions();
       Settings = new SettingsOptions();
       Spaces = new SpaceOptions();
       Mapper = new MapperOptions();
@@ -57,9 +56,6 @@ namespace zero.Core.Options
     /// <inheritdoc />
     public PermissionOptions Permissions { get; private set; }
 
-    /// <inheritdoc />
-    public RendererOptions Renderers { get; private set; }
-
     /// <inheritdoc />
     public SettingsOptions Settings { get; private set; }
 
@@ -134,11 +130,6 @@ namespace zero.Core.Options
     /// </summary>
     PermissionOptions Permissions { get; }
 
-    /// <summary>
-    /// 
-    /// </summary>
-    RendererOptions Renderers { get; }
-
     /// <summary>
     /// 
     /// </summary>
diff --git a/zero.Debug/TestData/Lists/SocialContentRenderer.cs b/zero.Debug/TestData/Lists/SocialContentRenderer.cs
deleted file mode 100644
index 50ebefbb..00000000
--- a/zero.Debug/TestData/Lists/SocialContentRenderer.cs
+++ /dev/null
@@ -1,87 +0,0 @@
-using FluentValidation;
-using zero.Core.Renderer;
-
-namespace zero.TestData.Lists
-{
-  public class SocialContentRenderer : AbstractRenderer<SocialContent>
-  {
-    public SocialContentRenderer()
-    {
-      LabelTemplate = "@_test.fields.{0}";
-      DescriptionTemplate = "@_test.fields.{0}_text";
-
-      Field(x => x.IsVisible).Toggle();
-      Field(x => x.xIconPicker).IconPicker();
-      Field(x => x.xTextarea).Textarea();
-      //Field(x => x.Addresses, required: true).Nested(new SocialAddressRenderer(), opts =>
-      //{
-      //  opts.Limit = 5;
-      //  opts.AddLabel = "Add address";
-      //});
-      Field(x => x.xRte).Rte();
-      Field(x => x.xMedia).Media(opts => opts.Type = MediaOptionsType.Image);
-      Field(x => x.xTextarea).Output();
-      Field(x => x.xState).State(opts =>
-      {
-        opts.Add("Image", "image");
-        opts.Add("Video" , "video");
-        opts.Add("Other", "other");
-      });
-      Field(x => x.xCustom).Custom("MyPlugin/myplugineditor.vue", () => new
-      {
-        enabled = true,
-        name = "tobi"
-      });
-      Tab("Networks", () => {
-
-        Field(x => x.Facebook, required: true).Text(opts => opts.Placeholder = "Enter your facebook URL");
-        Field(x => x.Youtube).Text();
-        Field(x => x.Twitter).Text(opts => opts.Classes.Add("is-short"));
-      });
-    }
-  }
-
-
-  public class SocialAddressRenderer : AbstractRenderer<SocialAddress>
-  {
-    public SocialAddressRenderer()
-    {
-      LabelTemplate = "@_test.fields.address.{0}";
-      DescriptionTemplate = "@{0}";
-
-      Field(x => x.City, required: true).Text();
-      Field(x => x.Street).Text();
-      Field(x => x.No).Text(opts => opts.Classes.Add("is-short"));
-      Field(x => x.Countries, required: true).Nested(new SocialAddressCountryRenderer(), opts =>
-      {
-        opts.Limit = 1;
-      });
-      //Field(x => x.CountryId).Custom("plugins/countryPicker/countrypicker", () => new
-      //{
-      //  startId = 107
-      //});
-    }
-  }
-
-
-  public class SocialAddressCountryRenderer : AbstractRenderer<SocialAddressCountry>
-  {
-    public SocialAddressCountryRenderer()
-    {
-      LabelTemplate = "@_test.fields.address.{0}";
-      DescriptionTemplate = "@{0}";
-
-      Field(x => x.Name, required: true).Text();
-      Field(x => x.Iso, required: true).Text();
-    }
-  }
-
-
-  public class SocialContentValidator : AbstractValidator<SocialContent>
-  {
-    public SocialContentValidator()
-    {
-      RuleFor(x => x.Facebook).NotEmpty().MaximumLength(120);
-    }
-  }
-}
\ No newline at end of file
diff --git a/zero.Debug/TestData/Lists/TeamMemberRenderer.cs b/zero.Debug/TestData/Lists/TeamMemberRenderer.cs
deleted file mode 100644
index e8088b04..00000000
--- a/zero.Debug/TestData/Lists/TeamMemberRenderer.cs
+++ /dev/null
@@ -1,54 +0,0 @@
-using FluentValidation;
-using zero.Core.Renderer;
-
-namespace zero.TestData.Lists
-{
-  public class TeamMemberRenderer : AbstractRenderer<TeamMember>
-  {
-    public TeamMemberRenderer()
-    {
-      LabelTemplate = "@_test.fields.{0}";
-      DescriptionTemplate = "@_test.fields.{0}_text";
-
-      Field(x => x.Name, required: true).Text(opts => opts.Placeholder = "Enter your name");
-      Field(x => x.Position, required: true).Text();
-      Field(x => x.Image).Media(opts => opts.Type = MediaOptionsType.Image);
-      Field(x => x.Email, required: true).Text(opts => opts.Classes.Add("email-field"));
-      Field(x => x.VideoUri).Text();
-      //Field(x => x.Addresses, required: true).Nested(new AddressRenderer(), opts =>
-      //{
-      //  opts.Limit = 5;
-      //  opts.AddLabel = "Add address";
-      //});
-    }
-  }
-
-
-  public class AddressRenderer : AbstractRenderer<TeamMemberAddress>
-  {
-    public AddressRenderer()
-    {
-      LabelTemplate = "@_test.fields.address.{0}";
-      DescriptionTemplate = "@{0}";
-
-      Field(x => x.City, required: true).Text();
-      Field(x => x.Street).Text();
-      Field(x => x.No).Text(opts => opts.Classes.Add("is-short"));
-      //Field(x => x.CountryId).Custom("plugins/countryPicker/countrypicker", () => new
-      //{
-      //  startId = 107
-      //});
-    }
-  }
-
-
-  public class TeamMemberValidator : AbstractValidator<TeamMember>
-  {
-    public TeamMemberValidator()
-    {
-      RuleFor(x => x.Name).NotEmpty().MaximumLength(120);
-      RuleFor(x => x.Position).NotEmpty().Length(3, 60);
-      RuleFor(x => x.Email).NotEmpty().EmailAddress();
-    }
-  }
-}
\ No newline at end of file
diff --git a/zero.Debug/TestData/MyRedirectPageRenderer.cs b/zero.Debug/TestData/MyRedirectPageRenderer.cs
deleted file mode 100644
index 8495017a..00000000
--- a/zero.Debug/TestData/MyRedirectPageRenderer.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System.Linq;
-using zero.Commerce.Entities;
-using zero.Core.Renderer;
-using zero.Debug.Models;
-using zero.TestData;
-
-namespace zero.Debug.TestData
-{
-  public class MyRedirectPageRenderer : RedirectPageRenderer
-  {
-    public MyRedirectPageRenderer() : base()
-    {
-      Field(x => x.Name).Text(opts => opts.MaxLength = 100);
-      //Properties.FirstOrDefault(x => x.Method == "tab")
-    }
-  }
-}
diff --git a/zero.Debug/TestData/Renderers/ContentPageRenderer.cs b/zero.Debug/TestData/Renderers/ContentPageRenderer.cs
deleted file mode 100644
index a849c2d8..00000000
--- a/zero.Debug/TestData/Renderers/ContentPageRenderer.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-using FluentValidation;
-using zero.Core.Renderer;
-
-namespace zero.TestData
-{
-  public class ContentPageRenderer : AbstractRenderer<ContentPage>
-  {
-    public ContentPageRenderer()
-    {
-      Alias = "debug.contentpage";
-
-      LabelTemplate = "@_test.fields.{0}";
-      DescriptionTemplate = "@_test.fields.{0}_text";
-
-      Field(x => x.Name, required: true).Text();
-
-      Tab("Options", () =>
-      {
-        Field(x => x.Options).Renderer(new OptionsPagePartialRenderer());
-      });
-
-      Tab("Meta", () =>
-      {
-        Field(x => x.Meta).Renderer(new MetaPagePartialRenderer());
-      });
-    }
-  }
-
-
-  public class ContentPageValidator : AbstractValidator<ContentPage>
-  {
-    public ContentPageValidator()
-    {
-      RuleFor(x => x.Name).NotEmpty().MaximumLength(30);
-    }
-  }
-}
diff --git a/zero.Debug/TestData/Renderers/MetaPagePartialRenderer.cs b/zero.Debug/TestData/Renderers/MetaPagePartialRenderer.cs
deleted file mode 100644
index 5a8510c0..00000000
--- a/zero.Debug/TestData/Renderers/MetaPagePartialRenderer.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-using FluentValidation;
-using zero.Core.Renderer;
-
-namespace zero.TestData
-{
-  public class MetaPagePartialRenderer : AbstractRenderer<MetaPagePartial>
-  {
-    public MetaPagePartialRenderer()
-    {
-      LabelTemplate = "@_test.fields.{0}";
-      DescriptionTemplate = "@_test.fields.{0}_text";
-
-      Field(x => x.HideInTitle).Toggle();
-      Field(x => x.TitleOverride).Text();
-      Field(x => x.TitleOverrideAll).Text();
-      Field(x => x.SeoDescription).Textarea(opts => opts.MaxLength = 160);
-      Field(x => x.SeoImage).Media();
-      Field(x => x.NoFollow).Toggle();
-      Field(x => x.NoIndex).Toggle();
-    }
-  }
-
-
-  public class MetaPagePartialValidator : AbstractValidator<MetaPagePartial>
-  {
-    public MetaPagePartialValidator()
-    {
-      RuleFor(x => x.SeoDescription).MaximumLength(160);
-    }
-  }
-}
diff --git a/zero.Debug/TestData/Renderers/NewsPageRenderer.cs b/zero.Debug/TestData/Renderers/NewsPageRenderer.cs
deleted file mode 100644
index 477276cf..00000000
--- a/zero.Debug/TestData/Renderers/NewsPageRenderer.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using FluentValidation;
-using System;
-using System.Collections.Generic;
-using System.Text;
-using zero.Core.Renderer;
-
-namespace zero.TestData
-{
-  public class NewsPageRenderer : AbstractRenderer<NewsPage>
-  {
-    public NewsPageRenderer()
-    {
-      Alias = "debug.newspage";
-
-      LabelTemplate = "@_test.fields.{0}";
-      DescriptionTemplate = "@_test.fields.{0}_text";
-
-      Field(x => x.Name, required: true).Text(opts => opts.Placeholder = "Enter your name");
-      Field(x => x.Text, required: true).Rte();
-    }
-  }
-
-
-  public class NewsPageValidator : AbstractValidator<NewsPage>
-  {
-    public NewsPageValidator()
-    {
-      RuleFor(x => x.Name).NotEmpty().MaximumLength(30);
-      RuleFor(x => x.Text).NotEmpty();
-    }
-  }
-}
diff --git a/zero.Debug/TestData/Renderers/OptionsPagePartialRenderer.cs b/zero.Debug/TestData/Renderers/OptionsPagePartialRenderer.cs
deleted file mode 100644
index fd221cc9..00000000
--- a/zero.Debug/TestData/Renderers/OptionsPagePartialRenderer.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using FluentValidation;
-using zero.Core.Renderer;
-
-namespace zero.TestData
-{
-  public class OptionsPagePartialRenderer : AbstractRenderer<OptionsPagePartial>
-  {
-    public OptionsPagePartialRenderer()
-    {
-      LabelTemplate = "@_test.fields.{0}";
-      DescriptionTemplate = "@_test.fields.{0}_text";
-
-      Field(x => x.HideInNavigation).Toggle();
-    }
-  }
-
-
-  public class OptionsPagePartialValidator : AbstractValidator<OptionsPagePartial>
-  {
-    public OptionsPagePartialValidator()
-    {
-      
-    }
-  }
-}
diff --git a/zero.Debug/TestData/Renderers/RedirectPageRenderer.cs b/zero.Debug/TestData/Renderers/RedirectPageRenderer.cs
deleted file mode 100644
index 1639e96b..00000000
--- a/zero.Debug/TestData/Renderers/RedirectPageRenderer.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using FluentValidation;
-using System;
-using System.Collections.Generic;
-using System.Text;
-using zero.Core.Renderer;
-
-namespace zero.TestData
-{
-  public class RedirectPageRenderer : AbstractRenderer<RedirectPage>
-  {
-    public RedirectPageRenderer()
-    {
-      Alias = "debug.redirectpage";
-
-      LabelTemplate = "@_test.fields.{0}";
-      DescriptionTemplate = "@_test.fields.{0}_text";
-
-      Field(x => x.Name, required: true).Text(opts => opts.Placeholder = "Enter your name");
-      Field(x => x.Link, required: true).Text();
-
-      Tab("Options", () =>
-      {
-        Field(x => x.Options).Renderer(new OptionsPagePartialRenderer(), opts => opts.HideLabel = true);
-      });
-    }
-  }
-
-
-  public class RedirectPageValidator : AbstractValidator<RedirectPage>
-  {
-    public RedirectPageValidator()
-    {
-      RuleFor(x => x.Name).NotEmpty().MaximumLength(30);
-    }
-  }
-}
diff --git a/zero.Debug/TestData/Renderers/TestRenderer.cs b/zero.Debug/TestData/Renderers/TestRenderer.cs
deleted file mode 100644
index 6d981575..00000000
--- a/zero.Debug/TestData/Renderers/TestRenderer.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using FluentValidation;
-using System;
-using System.Collections.Generic;
-using System.Text;
-using zero.Core.Renderer;
-
-namespace zero.TestData
-{
-  public class TestRenderer : AbstractRenderer<RedirectPage>
-  {
-    public TestRenderer()
-    {
-      Alias = "debug.redirectpage";
-
-      LabelTemplate = "@_test.fields.{0}";
-      DescriptionTemplate = "@_test.fields.{0}_text";
-
-      Field(x => x.Name, required: true).Text();
-
-      Field(x => x.Name, required: true).Text(opts => opts.Placeholder = "Enter your name");
-      Field(x => x.Link, required: true).Text();
-
-      Tab("Options", () =>
-      {
-        Field(x => x.Options).Renderer(new OptionsPagePartialRenderer(), opts => opts.HideLabel = true);
-      });
-    }
-  }
-}
diff --git a/zero.Debug/TestData/TestPlugin.cs b/zero.Debug/TestData/TestPlugin.cs
index d10138cf..cb78f4d1 100644
--- a/zero.Debug/TestData/TestPlugin.cs
+++ b/zero.Debug/TestData/TestPlugin.cs
@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using zero.Core.Options;
 using zero.Core.Plugins;
 using zero.Debug.TestData;
-using zero.TestData.Lists;
 
 namespace zero.TestData
 {
@@ -21,14 +20,6 @@ namespace zero.TestData
       zero.Features.Add(TestFeatures.Wishlist, "Wishlist", "Frontend wishlist for logged-in users");
       zero.Features.Add(TestFeatures.SocialShopping, "Social shopping", "Integrate products into social media portals");
 
-      zero.Renderers.Add<TeamMemberRenderer>();
-      zero.Renderers.Add<SocialContentRenderer>();
-      zero.Renderers.Add<OptionsPagePartialRenderer>();
-      zero.Renderers.Add<MetaPagePartialRenderer>();
-      zero.Renderers.Add<NewsPageRenderer>();
-      zero.Renderers.Add<RedirectPageRenderer>();
-      zero.Renderers.Add<ContentPageRenderer>();
-
       zero.Pages.Add<NewsPage>("news", "News", "News about the company", "fth-file-text");
       zero.Pages.Add<ContentPage>("content", "Page", "Page consisting of modules", "fth-box", allowAsRoot: true, allowAllChildrenTypes: true);
       zero.Pages.Add<ContentPage>("root", "Homepage", "Entry point for the website", "fth-home", allowAsRoot: true, allowAllChildrenTypes: true);
diff --git a/zero.Web.UI/App/components/forms/form-header.vue b/zero.Web.UI/App/components/forms/form-header.vue
index 8a75a651..6ded43a0 100644
--- a/zero.Web.UI/App/components/forms/form-header.vue
+++ b/zero.Web.UI/App/components/forms/form-header.vue
@@ -4,8 +4,8 @@
       <template v-slot:button>
         <ui-button type="white" label="@ui.actions" caret="down" />
       </template>
-      <ui-dropdown-button v-if="canDelete" label="@ui.delete" icon="fth-trash" @click="onDelete" :disabled="disabled" />
       <slot name="actions"></slot>
+      <ui-dropdown-button v-if="canDelete" label="@ui.delete" icon="fth-trash" @click="onDelete" :disabled="disabled" />
     </ui-dropdown>
     <ui-button :submit="true" label="@ui.save" :state="state" v-if="!disabled" />
   </ui-header-bar>
diff --git a/zero.Web.UI/App/editor/fields/culture.vue b/zero.Web.UI/App/editor/fields/culture.vue
new file mode 100644
index 00000000..4c2fb6cf
--- /dev/null
+++ b/zero.Web.UI/App/editor/fields/culture.vue
@@ -0,0 +1,37 @@
+<template>
+  <div class="ui-native-select">
+    <select :value="value" @input="$emit('input', $event.target.value)" :disabled="disabled">
+      <option v-for="item in items" :value="item.code">{{item.name}}</option>
+    </select>
+  </div>
+</template>
+
+
+<script>
+  import LanguagesApi from 'zero/resources/languages';
+
+  export default {
+    props: {
+      value: {
+        type: String
+      },
+      config: Object,
+      disabled: {
+        type: Boolean,
+        default: false
+      }
+    },
+
+    data: () => ({
+      items: []
+    }),
+
+    mounted()
+    {
+      LanguagesApi.getSupportedCultures().then(res =>
+      {
+        this.items = res
+      });
+    }
+  }
+</script>
\ No newline at end of file
diff --git a/zero.Web.UI/App/pages/settings/user.vue b/zero.Web.UI/App/pages/settings/user.vue
index 73db9323..13ef9696 100644
--- a/zero.Web.UI/App/pages/settings/user.vue
+++ b/zero.Web.UI/App/pages/settings/user.vue
@@ -1,90 +1,30 @@
 <template>
   <ui-form ref="form" class="user" v-slot="form" @submit="onSubmit" @load="onLoad" :route="route">
-    <ui-form-header v-model="model" title="@user.name" :disabled="disabled" :is-create="!id" :state="form.state" :can-delete="meta.canDelete" @delete="onDelete" />
-    <ui-editor config="user" v-model="model" :meta="meta" :active-toggle="false" />
+    <ui-form-header v-model="model" title="@user.name" :disabled="disabled" :is-create="!id" :state="form.state" :can-delete="meta.canDelete" @delete="onDelete">
+      <template v-slot:actions>
+        <ui-dropdown-button v-if="model.isActive" label="Disable" icon="fth-minus-circle" @click="onActiveChange" :disabled="disabled" />
+        <ui-dropdown-button v-if="!model.isActive" label="Enable" icon="fth-plus-circle" @click="onActiveChange" :disabled="disabled" />
+        <ui-dropdown-button label="Change password" icon="fth-lock" :disabled="disabled" />
+      </template>
+    </ui-form-header>
+    <ui-editor config="user" v-model="model" :meta="meta">
+      <template v-slot:settings>
+        <ui-property label="@user.fields.isLockedOut" :is-text="true" class="is-toggle">
+          <ui-toggle :value="isLockedOut" :negative="true" @input="onLockoutChange" />
+        </ui-property>
+        <p v-if="isLockedOut" class="ui-message type-error block user-aside-error">
+          <i class="ui-message-icon fth-alert-circle"></i>
+          <span class="ui-message-text">
+            <span v-localize:html="'@user.fields.isLockedOut_warning'"></span>:<br>
+            <strong><ui-date v-model="model.lockoutEnd" format="long" /></strong>
+          </span>
+        </p>
+        <ui-message v-if="!model.isActive" class="user-aside-error" type="error" text="@user.fields.isDisabled_warning" />
+      </template>
+    </ui-editor>
   </ui-form>
 </template>
 
-<!--<template>
-  <ui-form ref="form" class="user" v-slot="form" @submit="onSubmit" @load="onLoad">
-
-    <ui-header-bar :title="model.name" title-empty="@user.name" :back-button="true">
-      <ui-dropdown align="right">
-        <template v-slot:button>
-          <ui-button type="white" label="Actions" caret="down" />
-        </template>
-        <ui-dropdown-list v-model="actions" :action="actionSelected" />
-      </ui-dropdown>
-      <ui-button :submit="true" label="Save" :state="form.state" />
-    </ui-header-bar>
-
-    <ui-tabs>
-
-      <ui-tab class="ui-view-box has-sidebar" label="General">
-
-        <div class="ui-box">
-          <ui-property label="@ui.name" :required="true">
-            <input v-model="model.name" type="text" class="ui-input" v-localize:placeholder="'@user.fields.name_placeholder'" />
-          </ui-property>
-          <ui-property label="@user.fields.email" description="@user.fields.email_text" :required="true">
-            <input v-model.trim="model.email" type="email" class="ui-input" v-localize:placeholder="'@user.fields.email_placeholder'" />
-          </ui-property>
-          <ui-property label="@user.fields.language" description="@user.fields.language_text" :required="true">
-            <div class="ui-native-select">
-              <select v-model="model.languageId">
-                <option v-for="culture in model.supportedCultures" :value="culture.code">{{culture.name}}</option>
-              </select>
-            </div>
-          </ui-property>
-          <ui-property label="@user.fields.avatar" description="@user.fields.avatar_text" :required="true">
-            <ui-mediapicker :config="avatarConfig" v-model="model.avatarId" :disabled="disabled" />
-          </ui-property>
-        </div>
-
-        <aside class="user-aside">
-          <div class="ui-view-box-aside ui-box">
-
-            <ui-property label="@user.fields.isLockedOut" :vertical="true" :is-text="true">
-              <ui-toggle :value="isLockedOut" :negative="true" @input="onLockoutChange" />
-              <p v-if="isLockedOut" class="ui-message type-error block user-aside-error">
-                <i class="ui-message-icon fth-alert-circle"></i>
-                <span class="ui-message-text">
-                  <span v-localize:html="'@user.fields.isLockedOut_warning'"></span>:<br>
-                  <strong><ui-date v-model="model.lockoutEnd" format="long" /></strong>
-                </span>
-              </p>
-              <ui-message v-if="!model.isActive" class="user-aside-error" type="error" text="@user.fields.isDisabled_warning" />
-            </ui-property>
-          </div>
-          <div class="ui-view-box-aside">
-            <ui-property label="@ui.id" :vertical="true" :is-text="true">
-              {{model.id}}
-            </ui-property>
-            <ui-property label="@ui.createdDate" :vertical="true" :is-text="true">
-              <ui-date v-model="model.createdDate" />
-            </ui-property>
-          </div>
-        </aside>
-      </ui-tab>
-
-      <ui-tab label="Permissions">
-        <div class="ui-box">
-          <ui-property label="@user.fields.roles" description="@user.fields.roles_text" :required="true">
-            select
-          </ui-property>
-        </div>
-        <div class="ui-box">
-          <ui-property label="@user.fields.sections" description="@user.fields.sections_text" :required="true">
-            select
-          </ui-property>
-        </div>
-      </ui-tab>
-
-    </ui-tabs>
-  </ui-form>
-</template>-->
-
-
 <script>
   import { filter as _filter } from 'underscore';
   import UsersApi from 'zero/resources/users';
@@ -101,12 +41,20 @@
         avatarId: null,
         name: null,
         email: null,
-        supportedCultures: []
+        lockoutEnd: null
       },
       route: zero.alias.sections.settings + '-' + zero.alias.settings.users + '-edit',
-      disabled: false
+      disabled: false,
+      originalLockoutEnd: null
     }),
 
+    computed: {
+      isLockedOut()
+      {
+        return !!this.model.lockoutEnd;
+      }
+    },
+
     methods: {
 
       onLoad(form)
@@ -115,14 +63,21 @@
         {
           this.disabled = !response.meta.canEdit;
           this.meta = response.meta;
-          this.model = response;
+          this.model = response.entity;
+          this.originalLockoutEnd = this.model.lockoutEnd;
         });
       },
 
 
       onSubmit(form)
       {
-        form.handle(UsersApi.save(this.model));
+        form.handle(UsersApi.save(this.model)).then(res =>
+        {
+          if (res.entity.id === AuthApi.user.id)
+          { 
+            AuthApi.setUser(res.entity);
+          }
+        });
       },
 
 
@@ -130,143 +85,6 @@
       {
         opts.hide();
         this.$refs.form.onDelete(UsersApi.delete.bind(this, this.id));
-      }     
-    }
-  }
-</script>
-
-<!--<script>
-  import UsersApi from 'zero/resources/users';
-  import Strings from 'zero/services/strings';
-  import AuthApi from 'zero/services/auth'
-
-  export default {
-    props: ['id'],
-
-    name: 'app-settings-user',
-
-    data: () => ({
-      loading: true,
-      disabled: false,
-      actions: [],
-      model: {
-        avatarId: null,
-        name: null,
-        email: null,
-        supportedCultures: []
-      },
-      avatarConfig: {
-        display: 'big',
-        fileExtensions: zero.config.media.defaults.images
-      },
-      originalLockoutEnd: null
-    }),
-
-    created()
-    {
-      this.actions.push({
-        key: 'disabled',
-        name: 'Disable',
-        icon: 'fth-minus-circle',
-        action: (item, opts) =>
-        {
-          this.onActiveChange(opts);
-        }
-      });
-      this.actions.push({
-        name: 'Change password',
-        icon: 'fth-lock'
-      });
-      this.actions.push({
-        name: 'Delete',
-        icon: 'fth-x',
-        action: this.onDelete
-      });
-    },
-
-
-    computed: {
-      isLockedOut()
-      {
-        return !!this.model.lockoutEnd;
-      }
-    },
-
-
-    beforeRouteLeave(to, from, next) 
-    {
-      this.$refs.form.beforeRouteLeave(to, from, next);
-    },
-
-
-    methods: {
-
-      onBack()
-      {
-        this.$router.go(-1);
-      },
-
-
-      onLoad(form)
-      {
-        form.load(UsersApi.getById(this.id)).then(response =>
-        {
-          this.disabled = !response.canEdit;
-          this.model = response;
-          this.originalLockoutEnd = this.model.lockoutEnd;
-
-          if (!this.model.isActive)
-          {
-            this.actions[0].name = 'Enable';
-            this.actions[0].icon = 'fth-plus-circle';
-          }
-        });
-      },
-
-
-      onSubmit(form)
-      {
-        form.handle(UsersApi.save(this.model)).then(response =>
-        {
-          if (response.model.id === AuthApi.user.id)
-          {
-            AuthApi.setUser(response.model);
-          }
-
-          if (!this.id)
-          {
-            this.$router.replace({
-              name: zero.alias.sections.settings + '-' + zero.alias.settings.users + '-edit',
-              params: { id: response.model.id }
-            });
-          }
-        });
-      },
-
-
-      onDelete(item, opts)
-      {
-        opts.hide();
-
-        Overlay.confirmDelete().then((opts) =>
-        {
-          opts.state('loading');
-
-          UsersApi.delete(this.id).then(response =>
-          {
-            if (response.success)
-            {
-              opts.state('success');
-              opts.hide();
-              this.$router.go(-1);
-              // TODO show message
-            }
-            else
-            {
-              opts.errors(response.errors);
-            }
-          });
-        }); 
       },
 
 
@@ -276,7 +94,7 @@
       },
 
 
-      onActiveChange(opts)
+      onActiveChange(value, opts)
       {
         opts.loading(true);
 
@@ -291,28 +109,16 @@
           if (response.success)
           {
             this.model.isActive = isActive;
-            this.actions[0].name = isActive ? 'Disable' : 'Enable';
-            this.actions[0].icon = isActive ? 'fth-minus-circle' : 'fth-plus-circle';
           }
         });
       },
-
-
-      actionSelected(item, dropdown)
-      {
-        dropdown.hide();
-      }
     }
   }
 </script>
 
 <style lang="scss">
-  .user-aside
-  {
-    width: 360px;
-  }
   .user-aside-error
   {
     margin-bottom: 0;
   }
-</style>-->
\ No newline at end of file
+</style>
\ No newline at end of file
diff --git a/zero.Web.UI/App/renderers/user.js b/zero.Web.UI/App/renderers/user.js
index e9f7b34e..c7fb1599 100644
--- a/zero.Web.UI/App/renderers/user.js
+++ b/zero.Web.UI/App/renderers/user.js
@@ -44,6 +44,11 @@ export default {
       display: 'text',
       required: true
     },
+    {
+      field: 'languageId',
+      display: 'culture',
+      required: true
+    },
     {
       field: 'avatarId',
       display: 'media',
diff --git a/zero.Web.UI/App/resources/languages.js b/zero.Web.UI/App/resources/languages.js
index a6f0b081..ce00def4 100644
--- a/zero.Web.UI/App/resources/languages.js
+++ b/zero.Web.UI/App/resources/languages.js
@@ -26,6 +26,12 @@ export default {
     return Axios.get('languages/getAllCultures').then(res => Promise.resolve(res.data));
   },
 
+  // get all supported backoffice cultures
+  getSupportedCultures()
+  {
+    return Axios.get('languages/getSupportedCultures').then(res => Promise.resolve(res.data));
+  },
+
   // save a language
   save(model)
   {
diff --git a/zero.Web/Controllers/LanguagesController.cs b/zero.Web/Controllers/LanguagesController.cs
index 69d20634..eecae652 100644
--- a/zero.Web/Controllers/LanguagesController.cs
+++ b/zero.Web/Controllers/LanguagesController.cs
@@ -3,7 +3,6 @@ using System.Threading.Tasks;
 using zero.Core.Api;
 using zero.Core.Entities;
 using zero.Core.Identity;
-using zero.Core.Renderer;
 using zero.Web.Filters;
 
 namespace zero.Web.Controllers
@@ -32,12 +31,6 @@ namespace zero.Web.Controllers
     public async Task<IActionResult> GetById([FromQuery] string id) => Edit(await Api.GetById(id));
 
 
-    /// <summary>
-    /// Get language renderer
-    /// </summary>
-    public IActionResult GetRenderer([FromServices] IRenderer<T> renderer) => Json(renderer.Build());
-
-
     /// <summary>
     /// Get all languages
     /// </summary>    
@@ -50,6 +43,12 @@ namespace zero.Web.Controllers
     public IActionResult GetAllCultures() => Json(Api.GetAllCultures());
 
 
+    /// <summary>
+    /// Returns all available backoffice cultures.
+    /// </summary>
+    public IActionResult GetSupportedCultures() => Json(Api.GetAllCultures(Options.SupportedLanguages));
+
+
     /// <summary>
     /// Save language
     /// </summary>
diff --git a/zero.Web/Controllers/SpacesController.cs b/zero.Web/Controllers/SpacesController.cs
index c4ecbca3..eb9525f4 100644
--- a/zero.Web/Controllers/SpacesController.cs
+++ b/zero.Web/Controllers/SpacesController.cs
@@ -86,7 +86,7 @@ namespace zero.Web.Controllers
         //Id = model.Id,
         Alias = alias,
         //Model = model,
-        Config = Api.GetEditorConfig(alias)
+        //Config = Api.GetEditorConfig(alias)
       }, settings);
     }
 
diff --git a/zero.Web/Controllers/UsersController.cs b/zero.Web/Controllers/UsersController.cs
index cc910b98..9206d727 100644
--- a/zero.Web/Controllers/UsersController.cs
+++ b/zero.Web/Controllers/UsersController.cs
@@ -8,16 +8,18 @@ using zero.Web.Models;
 namespace zero.Web.Controllers
 {
   [ZeroAuthorize(Permissions.Settings.Users, PermissionsValue.Read)]
-  public class UsersController<TLanguage> : BackofficeController where TLanguage : ILanguage
+  public class UsersController<T, TLanguage> : BackofficeController 
+    where T : class, IUser
+    where TLanguage : ILanguage
   {
-    IUserApi Api;
+    IUserApi<T> Api;
     IAuthenticationApi AuthenticationApi;
     IUserRolesApi RolesApi;
     ILanguagesApi<TLanguage> LanguagesApi;
     IPermissionsApi PermissionsApi;
 
 
-    public UsersController(IUserApi api, IAuthenticationApi authenticationApi, IUserRolesApi rolesApi, ILanguagesApi<TLanguage> languagesApi, IPermissionsApi permissionsApi)
+    public UsersController(IUserApi<T> api, IAuthenticationApi authenticationApi, IUserRolesApi rolesApi, ILanguagesApi<TLanguage> languagesApi, IPermissionsApi permissionsApi)
     {
       Api = api;
       AuthenticationApi = authenticationApi;
@@ -27,59 +29,31 @@ namespace zero.Web.Controllers
     }
 
 
-    /// <summary>
-    /// Get user by id
-    /// </summary>    
-    public async Task<IActionResult> GetById([FromQuery] string id)
-    {
-      User user = await Api.GetUserById(id);
-
-      if (user == null)
-      {
-        return new StatusCodeResult(404);
-      }
-
-      UserEditModel model = await Mapper.Map<User, UserEditModel>(user);
-      model.SupportedCultures = LanguagesApi.GetAllCultures(Options.SupportedLanguages);
-
-      return Json(model);
-    }
+    public async Task<IActionResult> GetById([FromQuery] string id) => Edit(await Api.GetUserById(id));
 
 
-    /// <summary>
-    /// Get all users
-    /// </summary>    
-    public async Task<IActionResult> GetAll([FromQuery] ListQuery<User> query)
-    {
-      return await As<User, UserListModel>(await Api.GetByQuery(query)); // TODO , "zero.applications.1-A"
-    }
+    public IActionResult GetSupportedCultures() => Json(LanguagesApi.GetAllCultures(Options.SupportedLanguages));
 
 
-    /// <summary>
-    /// Get all permissions for selection
-    /// </summary>    
-    public IActionResult GetAllPermissions()
-    {
-      return Json(PermissionsApi.GetAll());
-    }
+    public async Task<IActionResult> GetAll([FromQuery] ListQuery<T> query) => Json(await Api.GetByQuery(query));
+
+
+    public IActionResult GetAllPermissions() => Json(PermissionsApi.GetAll());
 
 
-    /// <summary>
-    /// Updates a user password
-    /// </summary>
     [ZeroAuthorize]
     public async Task<IActionResult> UpdatePassword([FromBody] UserPasswordEditModel model)
     {
-      EntityResult<User> result;
+      EntityResult<T> result;
 
       if (model.NewPassword != model.ConfirmNewPassword)
       {
-        result = EntityResult<User>.Fail(nameof(model.NewPassword), "@errors.changepassword.newpasswordsnotmatching");
+        result = EntityResult<T>.Fail(nameof(model.NewPassword), "@errors.changepassword.newpasswordsnotmatching");
       }
       else
       {
         User user = await AuthenticationApi.GetUser();
-        result = await Api.UpdatePassword(user, model.CurrentPassword, model.NewPassword);
+        result = await Api.UpdatePassword(user as T, model.CurrentPassword, model.NewPassword);
 
         if (result.IsSuccess)
         {
@@ -88,62 +62,35 @@ namespace zero.Web.Controllers
       }
 
       return Json(result);
-      //return await As<Translation, TranslationEditModel>(await Api.);
     }
 
 
-    /// <summary>
-    /// Disables a user
-    /// </summary>
     [ZeroAuthorize(Permissions.Settings.Users, PermissionsValue.Write)]
-    public async Task<IActionResult> Disable([FromBody] UserEditModel model)
+    public async Task<IActionResult> Disable([FromBody] T model)
     {
-      User entity = await Api.GetUserById(model.Id);
-      return await As<User, UserEditModel>(await Api.Disable(entity));
+      T entity = await Api.GetUserById(model.Id);
+      return Json(await Api.Disable(entity));
     }
 
 
-    /// <summary>
-    /// Enables a user
-    /// </summary>
     [ZeroAuthorize(Permissions.Settings.Users, PermissionsValue.Write)]
-    public async Task<IActionResult> Enable([FromBody] UserEditModel model)
+    public async Task<IActionResult> Enable([FromBody] T model)
     {
-      User entity = await Api.GetUserById(model.Id);
-      return await As<User, UserEditModel>(await Api.Enable(entity));
+      T entity = await Api.GetUserById(model.Id);
+      return Json(await Api.Enable(entity));
     }
 
 
-    /// <summary>
-    /// Save user
-    /// </summary>
     [ZeroAuthorize(Permissions.Settings.Users, PermissionsValue.Write)]
-    public async Task<IActionResult> Save([FromBody] UserEditModel model)
-    {
-      User entity = await Mapper.Map(model, await Api.GetUserById(model.Id));
-      return await As<User, UserEditModel>(await Api.Save(entity));
-    }
+    public async Task<IActionResult> Save([FromBody] T model) => Json(await Api.Save(model));
 
 
-    /// <summary>
-    /// Update current user
-    /// </summary>
     [ZeroAuthorize(Permissions.Settings.Users, PermissionsValue.Write)]
     // TODO do not need settings.users authorization for editing current user profiles
-    public async Task<IActionResult> SaveCurrent([FromBody] UserEditModel model)
-    {
-      User entity = await Mapper.Map(model, await Api.GetUserById(model.Id));
-      return await As<User, UserEditModel>(await Api.Save(entity));
-    }
+    public async Task<IActionResult> SaveCurrent([FromBody] T model) => Json(await Api.Save(model));
 
 
-    /// <summary>
-    /// Deletes a user
-    /// </summary>
     [ZeroAuthorize(Permissions.Settings.Users, PermissionsValue.Write)]
-    public async Task<IActionResult> Delete([FromQuery] string id)
-    {
-      return await As<User, UserEditModel>(await Api.Delete(id));
-    }
+    public async Task<IActionResult> Delete([FromQuery] string id) => Json(await Api.Delete(id));
   }
 }
diff --git a/zero.Web/Defaults/ZeroBackofficePlugin.cs b/zero.Web/Defaults/ZeroBackofficePlugin.cs
index 041ad37c..799eb36a 100644
--- a/zero.Web/Defaults/ZeroBackofficePlugin.cs
+++ b/zero.Web/Defaults/ZeroBackofficePlugin.cs
@@ -7,7 +7,6 @@ using zero.Core.Entities;
 using zero.Core.Extensions;
 using zero.Core.Options;
 using zero.Core.Plugins;
-using zero.Core.Renderer;
 using zero.Web.Mapper;
 using zero.Web.Sections;
 
@@ -19,8 +18,6 @@ namespace zero.Web.Defaults
     {
       services.AddAll(typeof(IValidator<>), ServiceLifetime.Scoped);
       services.AddAll(typeof(IValidator), ServiceLifetime.Scoped);
-      services.AddAll(typeof(IRenderer<>), ServiceLifetime.Scoped);
-      services.AddAll(typeof(IRenderer), ServiceLifetime.Scoped);
 
       services.AddTransient<IApplication, Application>();
       services.AddTransient<ICountry, Country>();
@@ -36,12 +33,12 @@ namespace zero.Web.Defaults
       services.AddTransient(typeof(ITranslationsApiFacade), typeof(TranslationsApiFacade));
       services.AddTransient(typeof(IPagesApi<>), typeof(PagesApi<>));
       services.AddTransient(typeof(IPageTreeApi<>), typeof(PageTreeApi<>));
+      services.AddTransient(typeof(IUserApi<>), typeof(UserApi<>));
 
       services.AddTransient<ISetupApi, SetupApi>();
       services.AddTransient<ISectionsApi, SectionsApi>();
       services.AddTransient<ISettingsApi, SettingsApi>();
       services.AddTransient<IAuthenticationApi, AuthenticationApi>();
-      services.AddTransient<IUserApi, UserApi>();
       services.AddTransient<IUserRolesApi, UserRolesApi>();
       services.AddTransient<IToken, Token>();
       services.AddTransient<ISpacesApi, SpacesApi>();
diff --git a/zero.Web/Models/ObsoleteEditModel.cs b/zero.Web/Models/ObsoleteEditModel.cs
index 2bb8c91f..1f595cf2 100644
--- a/zero.Web/Models/ObsoleteEditModel.cs
+++ b/zero.Web/Models/ObsoleteEditModel.cs
@@ -1,5 +1,4 @@
 using System;
-using zero.Core.Renderer;
 
 namespace zero.Web.Models
 {
@@ -49,11 +48,6 @@ namespace zero.Web.Models
     /// // TODO expiration expiry  session.Advanced.GetMetadataFor(user)[Raven.Client.Constants.Documents.Metadata.Expires] = DateTime.UtcNow.AddMinutes(60);
     /// </summary>
     public string Token { get; set; }
-
-    /// <summary>
-    /// Submits the renderer configuration which is used to create the editor
-    /// </summary>
-    public RendererConfig Renderer { get; set; }
   }
 
 
diff --git a/zero.Web/Models/SpaceContentEditModel.cs b/zero.Web/Models/SpaceContentEditModel.cs
index c3a5bcc0..485f187e 100644
--- a/zero.Web/Models/SpaceContentEditModel.cs
+++ b/zero.Web/Models/SpaceContentEditModel.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using zero.Core.Entities;
-using zero.Core.Renderer;
 
 namespace zero.Web.Models
 {
@@ -10,7 +9,5 @@ namespace zero.Web.Models
     public string Alias { get; set; }
 
     public SpaceContent Model { get; set; }
-
-    public RendererConfig Config { get; set; }
   }
 }
diff --git a/zero.Web/Resources/Localization/zero.en-us.json b/zero.Web/Resources/Localization/zero.en-us.json
index c63ab9db..d19cabf0 100644
--- a/zero.Web/Resources/Localization/zero.en-us.json
+++ b/zero.Web/Resources/Localization/zero.en-us.json
@@ -206,8 +206,8 @@
       "email_placeholder": "Enter your email address",
       "avatarId": "Avatar",
       "avatarId_text": "Upload a user image",
-      "language": "Language",
-      "language_text": "Set the backoffice language for this user",
+      "languageId": "Language",
+      "languageId_text": "Set the backoffice language for this user",
       "roles": "Roles",
       "roles_text": "Add default permissions from roles",
       "sections": "Sections",