diff --git a/.gitignore b/.gitignore
index 5a2bcc2..7f0b957 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,8 @@
 *.user
 *.userosscache
 *.sln.docstates
+Web.Release.config
+Web.Debug.config
 
 # User-specific files (MonoDevelop/Xamarin Studio)
 *.userprefs
@@ -212,3 +214,10 @@ GeneratedArtifacts/
 _Pvt_Extensions/
 ModelManifest.xml
 /Portal.CMS.Web/Areas/Admin/Content/Media
+/Portal.CMS.Web/Areas/Profile/Content/Media/Avatars/media-*.png
+/PortalCMS.Web/Web.Debug.config
+/PortalCMS.Web/Web.Debug.config
+/PortalCMS.Web/*.config
+/PortalCMS.Web/Web.Debug.config
+/PortalCMS.Web/Web.config
+/PortalCMS.Web/Web.Release.config
diff --git a/Portal.CMS.Entities/Entities/PostRole.cs b/Portal.CMS.Entities/Entities/PostRole.cs
deleted file mode 100644
index 27bbc36..0000000
--- a/Portal.CMS.Entities/Entities/PostRole.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-
-namespace Portal.CMS.Entities.Entities
-{
-    public class PostRole
-    {
-        [Key]
-        public int PostRoleId { get; set; }
-
-        [ForeignKey("Post")]
-        public int PostId { get; set; }
-
-        public virtual Post Post { get; set; }
-
-        [ForeignKey("Role")]
-        public int RoleId { get; set; }
-
-        public virtual Role Role { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/Portal.CMS.Entities/Entities/Role.cs b/Portal.CMS.Entities/Entities/Role.cs
deleted file mode 100644
index 617c34b..0000000
--- a/Portal.CMS.Entities/Entities/Role.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using System.ComponentModel;
-using System.ComponentModel.DataAnnotations;
-
-namespace Portal.CMS.Entities.Entities
-{
-    public class Role
-    {
-        [Key]
-        public int RoleId { get; set; }
-
-        [Required]
-        public string RoleName { get; set; }
-
-        [Required]
-        [DefaultValue("true")]
-        public bool IsAssignable { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/Portal.CMS.Entities/Entities/User.cs b/Portal.CMS.Entities/Entities/User.cs
deleted file mode 100644
index f7eb115..0000000
--- a/Portal.CMS.Entities/Entities/User.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-
-namespace Portal.CMS.Entities.Entities
-{
-    public class User
-    {
-        [Key]
-        public int UserId { get; set; }
-
-        [Required]
-        public string EmailAddress { get; set; }
-
-        [Required]
-        public string Password { get; set; }
-
-        [Required]
-        public string GivenName { get; set; }
-
-        [Required]
-        public string FamilyName { get; set; }
-
-        [Required]
-        public DateTime DateAdded { get; set; }
-
-        [Required]
-        public DateTime DateUpdated { get; set; }
-
-        public string AvatarImagePath { get; set; }
-
-        public string Bio { get; set; }
-
-        public virtual ICollection<UserRole> Roles { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/Portal.CMS.Entities/Entities/UserRole.cs b/Portal.CMS.Entities/Entities/UserRole.cs
deleted file mode 100644
index cebe302..0000000
--- a/Portal.CMS.Entities/Entities/UserRole.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-
-namespace Portal.CMS.Entities.Entities
-{
-    public class UserRole
-    {
-        [Key]
-        public int UserRoleId { get; set; }
-
-        [ForeignKey("User")]
-        public int UserId { get; set; }
-
-        [ForeignKey("Role")]
-        public int RoleId { get; set; }
-
-        public virtual User User { get; set; }
-
-        public virtual Role Role { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/Portal.CMS.Entities/Entities/UserToken.cs b/Portal.CMS.Entities/Entities/UserToken.cs
deleted file mode 100644
index 8d22f20..0000000
--- a/Portal.CMS.Entities/Entities/UserToken.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using Portal.CMS.Entities.Enumerators;
-using System;
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-
-namespace Portal.CMS.Entities.Entities
-{
-    public class UserToken
-    {
-        [Key]
-        public int UserTokenId { get; set; }
-
-        [Required]
-        public UserTokenType UserTokenType { get; set; }
-
-        [Required]
-        public string Token { get; set; }
-
-        [ForeignKey(nameof(User))]
-        public int UserId { get; set; }
-
-        [Required]
-        public DateTime DateAdded { get; set; }
-
-        public DateTime? DateRedeemed { get; set; }
-
-        public virtual User User { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/Portal.CMS.Entities/Enumerators/ImageCategory.cs b/Portal.CMS.Entities/Enumerators/ImageCategory.cs
deleted file mode 100644
index 6e638f4..0000000
--- a/Portal.CMS.Entities/Enumerators/ImageCategory.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-namespace Portal.CMS.Entities.Enumerators
-{
-    public enum ImageCategory
-    {
-        General = 0,
-        Icon = 1,
-        Screenshot = 2,
-        Texture = 3
-    }
-}
\ No newline at end of file
diff --git a/Portal.CMS.Entities/Initialisers/DropAndMigrateDatabaseToLatestVersion.cs b/Portal.CMS.Entities/Initialisers/DropAndMigrateDatabaseToLatestVersion.cs
deleted file mode 100644
index 04c8247..0000000
--- a/Portal.CMS.Entities/Initialisers/DropAndMigrateDatabaseToLatestVersion.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-namespace Portal.CMS.Entities.Initialisers
-{
-    using System.Data.Entity;
-    using System.Data.Entity.Migrations;
-
-    public class DropAndMigrateDatabaseToLatestVersion<TContext, TMigrationsConfiguration> : IDatabaseInitializer<TContext> where TContext : DbContext, new() where TMigrationsConfiguration : DbMigrationsConfiguration<TContext>, new()
-    {
-        private readonly TMigrationsConfiguration config;
-
-        public DropAndMigrateDatabaseToLatestVersion()
-        {
-            config = new TMigrationsConfiguration();
-        }
-
-        public void InitializeDatabase(TContext context)
-        {
-            context.Database.Delete();
-
-            var migrator = new DbMigrator(config);
-            migrator.Update();
-
-            Seed(context);
-        }
-
-        public virtual void Seed(TContext context)
-        {
-        }
-    }
-}
\ No newline at end of file
diff --git a/Portal.CMS.Entities/Initialisers/Environments/DefaultInitialiser.cs b/Portal.CMS.Entities/Initialisers/Environments/DefaultInitialiser.cs
deleted file mode 100644
index 5802a16..0000000
--- a/Portal.CMS.Entities/Initialisers/Environments/DefaultInitialiser.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace Portal.CMS.Entities.Initialisers.Environments
-{
-    internal class DefaultInitialiser : MigrateDatabaseToLatestVersion
-    {
-    }
-}
\ No newline at end of file
diff --git a/Portal.CMS.Entities/Initialisers/MigrateDatabaseToLatestVersion.cs b/Portal.CMS.Entities/Initialisers/MigrateDatabaseToLatestVersion.cs
deleted file mode 100644
index 264737c..0000000
--- a/Portal.CMS.Entities/Initialisers/MigrateDatabaseToLatestVersion.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-namespace Portal.CMS.Entities.Initialisers
-{
-    using Portal.CMS.Entities.Migrations;
-    using System.Data.Entity;
-
-    internal class MigrateDatabaseToLatestVersion : MigrateDatabaseToLatestVersion<PortalEntityModel, Configuration>
-    {
-        public override void InitializeDatabase(PortalEntityModel context)
-        {
-            base.InitializeDatabase(context);
-
-            Seed(context);
-        }
-
-        public virtual void Seed(PortalEntityModel context)
-        {
-        }
-    }
-}
\ No newline at end of file
diff --git a/Portal.CMS.Entities/Migrations/201607122131202_InitialPortalCMSSchema.Designer.cs b/Portal.CMS.Entities/Migrations/201607122131202_InitialPortalCMSSchema.Designer.cs
deleted file mode 100644
index f1436e0..0000000
--- a/Portal.CMS.Entities/Migrations/201607122131202_InitialPortalCMSSchema.Designer.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-// <auto-generated />
-namespace Portal.CMS.Entities.Migrations
-{
-    using System.CodeDom.Compiler;
-    using System.Data.Entity.Migrations;
-    using System.Data.Entity.Migrations.Infrastructure;
-    using System.Resources;
-    
-    [GeneratedCode("EntityFramework.Migrations", "6.1.3-40302")]
-    public sealed partial class InitialPortalCMSSchema : IMigrationMetadata
-    {
-        readonly ResourceManager Resources = new ResourceManager(typeof(InitialPortalCMSSchema));
-        
-        string IMigrationMetadata.Id
-        {
-            get { return "201607122131202_InitialPortalCMSSchema"; }
-        }
-        
-        string IMigrationMetadata.Source
-        {
-            get { return null; }
-        }
-        
-        string IMigrationMetadata.Target
-        {
-            get { return Resources.GetString("Target"); }
-        }
-    }
-}
diff --git a/Portal.CMS.Entities/Migrations/201607122131202_InitialPortalCMSSchema.cs b/Portal.CMS.Entities/Migrations/201607122131202_InitialPortalCMSSchema.cs
deleted file mode 100644
index d8ba8cd..0000000
--- a/Portal.CMS.Entities/Migrations/201607122131202_InitialPortalCMSSchema.cs
+++ /dev/null
@@ -1,252 +0,0 @@
-namespace Portal.CMS.Entities.Migrations
-{
-    using System.Data.Entity.Migrations;
-
-    public partial class InitialPortalCMSSchema : DbMigration
-    {
-        public override void Up()
-        {
-            CreateTable(
-                "dbo.Copies",
-                c => new
-                {
-                    CopyId = c.Int(nullable: false, identity: true),
-                    CopyName = c.String(nullable: false),
-                    CopyBody = c.String(nullable: false),
-                    DateAdded = c.DateTime(nullable: false),
-                    DateUpdated = c.DateTime(nullable: false),
-                })
-                .PrimaryKey(t => t.CopyId);
-
-            CreateTable(
-                "dbo.Images",
-                c => new
-                {
-                    ImageId = c.Int(nullable: false, identity: true),
-                    ImageCategory = c.Int(nullable: false),
-                    ImagePath = c.String(),
-                })
-                .PrimaryKey(t => t.ImageId);
-
-            CreateTable(
-                "dbo.MenuItems",
-                c => new
-                {
-                    MenuItemId = c.Int(nullable: false, identity: true),
-                    MenuId = c.Int(nullable: false),
-                    LinkText = c.String(nullable: false),
-                    LinkAction = c.String(nullable: false),
-                    LinkController = c.String(nullable: false),
-                    LinkArea = c.String(),
-                })
-                .PrimaryKey(t => t.MenuItemId)
-                .ForeignKey("dbo.Menus", t => t.MenuId, cascadeDelete: true)
-                .Index(t => t.MenuId);
-
-            CreateTable(
-                "dbo.Menus",
-                c => new
-                {
-                    MenuId = c.Int(nullable: false, identity: true),
-                    MenuName = c.String(nullable: false),
-                })
-                .PrimaryKey(t => t.MenuId);
-
-            CreateTable(
-                "dbo.PageComponentTypes",
-                c => new
-                {
-                    PageComponentTypeId = c.Int(nullable: false, identity: true),
-                    PageComponentTypeName = c.String(nullable: false),
-                    PageComponentTypeCategory = c.Int(nullable: false),
-                    PageComponentTypeDescription = c.String(nullable: false),
-                    PageComponentBody = c.String(nullable: false),
-                })
-                .PrimaryKey(t => t.PageComponentTypeId);
-
-            CreateTable(
-                "dbo.Pages",
-                c => new
-                {
-                    PageId = c.Int(nullable: false, identity: true),
-                    PageName = c.String(nullable: false),
-                    PageArea = c.String(),
-                    PageController = c.String(nullable: false),
-                    PageAction = c.String(nullable: false),
-                    DateAdded = c.DateTime(nullable: false),
-                    DateUpdated = c.DateTime(nullable: false),
-                })
-                .PrimaryKey(t => t.PageId);
-
-            CreateTable(
-                "dbo.PageSections",
-                c => new
-                {
-                    PageSectionId = c.Int(nullable: false, identity: true),
-                    PageId = c.Int(nullable: false),
-                    PageSectionTypeId = c.Int(nullable: false),
-                    PageSectionBody = c.String(),
-                })
-                .PrimaryKey(t => t.PageSectionId)
-                .ForeignKey("dbo.Pages", t => t.PageId, cascadeDelete: true)
-                .ForeignKey("dbo.PageSectionTypes", t => t.PageSectionTypeId, cascadeDelete: true)
-                .Index(t => t.PageId)
-                .Index(t => t.PageSectionTypeId);
-
-            CreateTable(
-                "dbo.PageSectionTypes",
-                c => new
-                {
-                    PageSectionTypeId = c.Int(nullable: false, identity: true),
-                    PageSectionTypeName = c.String(nullable: false),
-                    PageSectionTypeBody = c.String(nullable: false),
-                })
-                .PrimaryKey(t => t.PageSectionTypeId);
-
-            CreateTable(
-                "dbo.PostCategories",
-                c => new
-                {
-                    PostCategoryId = c.Int(nullable: false, identity: true),
-                    PostCategoryName = c.String(nullable: false),
-                })
-                .PrimaryKey(t => t.PostCategoryId);
-
-            CreateTable(
-                "dbo.Posts",
-                c => new
-                {
-                    PostId = c.Int(nullable: false, identity: true),
-                    PostTitle = c.String(nullable: false),
-                    PostDescription = c.String(nullable: false),
-                    PostBody = c.String(nullable: false),
-                    PostAuthorUserId = c.Int(nullable: false),
-                    DateAdded = c.DateTime(nullable: false),
-                    DateUpdated = c.DateTime(nullable: false),
-                    PostCategoryId = c.Int(nullable: false),
-                    IsPublished = c.Boolean(nullable: false),
-                })
-                .PrimaryKey(t => t.PostId)
-                .ForeignKey("dbo.PostCategories", t => t.PostCategoryId, cascadeDelete: true)
-                .Index(t => t.PostCategoryId);
-
-            CreateTable(
-                "dbo.PostComments",
-                c => new
-                {
-                    PostCommentId = c.Int(nullable: false, identity: true),
-                    UserId = c.Int(nullable: false),
-                    PostId = c.Int(nullable: false),
-                    CommentBody = c.String(nullable: false),
-                    DateAdded = c.DateTime(nullable: false),
-                })
-                .PrimaryKey(t => t.PostCommentId)
-                .ForeignKey("dbo.Posts", t => t.PostId, cascadeDelete: true)
-                .ForeignKey("dbo.Users", t => t.UserId, cascadeDelete: true)
-                .Index(t => t.UserId)
-                .Index(t => t.PostId);
-
-            CreateTable(
-                "dbo.Users",
-                c => new
-                {
-                    UserId = c.Int(nullable: false, identity: true),
-                    EmailAddress = c.String(nullable: false),
-                    Password = c.String(nullable: false),
-                    GivenName = c.String(nullable: false),
-                    FamilyName = c.String(nullable: false),
-                    DateAdded = c.DateTime(nullable: false),
-                    DateUpdated = c.DateTime(nullable: false),
-                })
-                .PrimaryKey(t => t.UserId);
-
-            CreateTable(
-                "dbo.UserRoles",
-                c => new
-                {
-                    UserRoleId = c.Int(nullable: false, identity: true),
-                    UserId = c.Int(nullable: false),
-                    RoleId = c.Int(nullable: false),
-                })
-                .PrimaryKey(t => t.UserRoleId)
-                .ForeignKey("dbo.Roles", t => t.RoleId, cascadeDelete: true)
-                .ForeignKey("dbo.Users", t => t.UserId, cascadeDelete: true)
-                .Index(t => t.UserId)
-                .Index(t => t.RoleId);
-
-            CreateTable(
-                "dbo.Roles",
-                c => new
-                {
-                    RoleId = c.Int(nullable: false, identity: true),
-                    RoleName = c.String(nullable: false),
-                })
-                .PrimaryKey(t => t.RoleId);
-
-            CreateTable(
-                "dbo.PostImages",
-                c => new
-                {
-                    PostImageId = c.Int(nullable: false, identity: true),
-                    PostImageType = c.Int(nullable: false),
-                    PostId = c.Int(nullable: false),
-                    ImageId = c.Int(nullable: false),
-                })
-                .PrimaryKey(t => t.PostImageId)
-                .ForeignKey("dbo.Images", t => t.ImageId, cascadeDelete: true)
-                .ForeignKey("dbo.Posts", t => t.PostId, cascadeDelete: true)
-                .Index(t => t.PostId)
-                .Index(t => t.ImageId);
-
-            CreateTable(
-                "dbo.Settings",
-                c => new
-                {
-                    SettingId = c.Int(nullable: false, identity: true),
-                    SettingName = c.String(nullable: false),
-                    SettingValue = c.String(),
-                })
-                .PrimaryKey(t => t.SettingId);
-        }
-
-        public override void Down()
-        {
-            DropForeignKey("dbo.PostImages", "PostId", "dbo.Posts");
-            DropForeignKey("dbo.PostImages", "ImageId", "dbo.Images");
-            DropForeignKey("dbo.PostComments", "UserId", "dbo.Users");
-            DropForeignKey("dbo.UserRoles", "UserId", "dbo.Users");
-            DropForeignKey("dbo.UserRoles", "RoleId", "dbo.Roles");
-            DropForeignKey("dbo.PostComments", "PostId", "dbo.Posts");
-            DropForeignKey("dbo.Posts", "PostCategoryId", "dbo.PostCategories");
-            DropForeignKey("dbo.PageSections", "PageSectionTypeId", "dbo.PageSectionTypes");
-            DropForeignKey("dbo.PageSections", "PageId", "dbo.Pages");
-            DropForeignKey("dbo.MenuItems", "MenuId", "dbo.Menus");
-            DropIndex("dbo.PostImages", new[] { "ImageId" });
-            DropIndex("dbo.PostImages", new[] { "PostId" });
-            DropIndex("dbo.UserRoles", new[] { "RoleId" });
-            DropIndex("dbo.UserRoles", new[] { "UserId" });
-            DropIndex("dbo.PostComments", new[] { "PostId" });
-            DropIndex("dbo.PostComments", new[] { "UserId" });
-            DropIndex("dbo.Posts", new[] { "PostCategoryId" });
-            DropIndex("dbo.PageSections", new[] { "PageSectionTypeId" });
-            DropIndex("dbo.PageSections", new[] { "PageId" });
-            DropIndex("dbo.MenuItems", new[] { "MenuId" });
-            DropTable("dbo.Settings");
-            DropTable("dbo.PostImages");
-            DropTable("dbo.Roles");
-            DropTable("dbo.UserRoles");
-            DropTable("dbo.Users");
-            DropTable("dbo.PostComments");
-            DropTable("dbo.Posts");
-            DropTable("dbo.PostCategories");
-            DropTable("dbo.PageSectionTypes");
-            DropTable("dbo.PageSections");
-            DropTable("dbo.Pages");
-            DropTable("dbo.PageComponentTypes");
-            DropTable("dbo.Menus");
-            DropTable("dbo.MenuItems");
-            DropTable("dbo.Images");
-            DropTable("dbo.Copies");
-        }
-    }
-}
\ No newline at end of file
diff --git a/Portal.CMS.Entities/Migrations/201607122131202_InitialPortalCMSSchema.resx b/Portal.CMS.Entities/Migrations/201607122131202_InitialPortalCMSSchema.resx
deleted file mode 100644
index 6a57541..0000000
--- a/Portal.CMS.Entities/Migrations/201607122131202_InitialPortalCMSSchema.resx
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <data name="Target" xml:space="preserve">
-    <value>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</value>
-  </data>
-  <data name="DefaultSchema" xml:space="preserve">
-    <value>dbo</value>
-  </data>
-</root>
\ No newline at end of file
diff --git a/Portal.CMS.Entities/Migrations/201607142300116_AddAnalyticsEntities.Designer.cs b/Portal.CMS.Entities/Migrations/201607142300116_AddAnalyticsEntities.Designer.cs
deleted file mode 100644
index fc19ea7..0000000
--- a/Portal.CMS.Entities/Migrations/201607142300116_AddAnalyticsEntities.Designer.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-// <auto-generated />
-namespace Portal.CMS.Entities.Migrations
-{
-    using System.CodeDom.Compiler;
-    using System.Data.Entity.Migrations;
-    using System.Data.Entity.Migrations.Infrastructure;
-    using System.Resources;
-    
-    [GeneratedCode("EntityFramework.Migrations", "6.1.3-40302")]
-    public sealed partial class AddAnalyticsEntities : IMigrationMetadata
-    {
-        readonly ResourceManager Resources = new ResourceManager(typeof(AddAnalyticsEntities));
-        
-        string IMigrationMetadata.Id
-        {
-            get { return "201607142300116_AddAnalyticsEntities"; }
-        }
-        
-        string IMigrationMetadata.Source
-        {
-            get { return null; }
-        }
-        
-        string IMigrationMetadata.Target
-        {
-            get { return Resources.GetString("Target"); }
-        }
-    }
-}
diff --git a/Portal.CMS.Entities/Migrations/201607142300116_AddAnalyticsEntities.cs b/Portal.CMS.Entities/Migrations/201607142300116_AddAnalyticsEntities.cs
deleted file mode 100644
index c39026d..0000000
--- a/Portal.CMS.Entities/Migrations/201607142300116_AddAnalyticsEntities.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-namespace Portal.CMS.Entities.Migrations
-{
-    using System.Data.Entity.Migrations;
-
-    public partial class AddAnalyticsEntities : DbMigration
-    {
-        public override void Up()
-        {
-            CreateTable(
-                "dbo.AnalyticPageViews",
-                c => new
-                {
-                    AnalyticPageViewId = c.Int(nullable: false, identity: true),
-                    Area = c.String(),
-                    Controller = c.String(nullable: false),
-                    Action = c.String(nullable: false),
-                    ReferredUrl = c.String(nullable: false),
-                    DateAdded = c.DateTime(nullable: false),
-                    UserId = c.Int(nullable: false),
-                })
-                .PrimaryKey(t => t.AnalyticPageViewId);
-
-            CreateTable(
-                "dbo.AnalyticPostViews",
-                c => new
-                {
-                    AnalyticPageViewId = c.Int(nullable: false, identity: true),
-                    PostId = c.Int(nullable: false),
-                    ReferredUrl = c.String(nullable: false),
-                    DateAdded = c.DateTime(nullable: false),
-                    UserId = c.Int(nullable: false),
-                })
-                .PrimaryKey(t => t.AnalyticPageViewId);
-        }
-
-        public override void Down()
-        {
-            DropTable("dbo.AnalyticPostViews");
-            DropTable("dbo.AnalyticPageViews");
-        }
-    }
-}
\ No newline at end of file
diff --git a/Portal.CMS.Entities/Migrations/201607142300116_AddAnalyticsEntities.resx b/Portal.CMS.Entities/Migrations/201607142300116_AddAnalyticsEntities.resx
deleted file mode 100644
index c2821e1..0000000
--- a/Portal.CMS.Entities/Migrations/201607142300116_AddAnalyticsEntities.resx
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <data name="Target" xml:space="preserve">
-    <value>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</value>
-  </data>
-  <data name="DefaultSchema" xml:space="preserve">
-    <value>dbo</value>
-  </data>
-</root>
\ No newline at end of file
diff --git a/Portal.CMS.Entities/Migrations/201607161849511_AddPageSectionOrderToPageSections.Designer.cs b/Portal.CMS.Entities/Migrations/201607161849511_AddPageSectionOrderToPageSections.Designer.cs
deleted file mode 100644
index 9167aa0..0000000
--- a/Portal.CMS.Entities/Migrations/201607161849511_AddPageSectionOrderToPageSections.Designer.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-// <auto-generated />
-namespace Portal.CMS.Entities.Migrations
-{
-    using System.CodeDom.Compiler;
-    using System.Data.Entity.Migrations;
-    using System.Data.Entity.Migrations.Infrastructure;
-    using System.Resources;
-    
-    [GeneratedCode("EntityFramework.Migrations", "6.1.3-40302")]
-    public sealed partial class AddPageSectionOrderToPageSections : IMigrationMetadata
-    {
-        readonly ResourceManager Resources = new ResourceManager(typeof(AddPageSectionOrderToPageSections));
-        
-        string IMigrationMetadata.Id
-        {
-            get { return "201607161849511_AddPageSectionOrderToPageSections"; }
-        }
-        
-        string IMigrationMetadata.Source
-        {
-            get { return null; }
-        }
-        
-        string IMigrationMetadata.Target
-        {
-            get { return Resources.GetString("Target"); }
-        }
-    }
-}
diff --git a/Portal.CMS.Entities/Migrations/201607161849511_AddPageSectionOrderToPageSections.cs b/Portal.CMS.Entities/Migrations/201607161849511_AddPageSectionOrderToPageSections.cs
deleted file mode 100644
index 216bcd5..0000000
--- a/Portal.CMS.Entities/Migrations/201607161849511_AddPageSectionOrderToPageSections.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-namespace Portal.CMS.Entities.Migrations
-{
-    using System.Data.Entity.Migrations;
-
-    public partial class AddPageSectionOrderToPageSections : DbMigration
-    {
-        public override void Up()
-        {
-            AddColumn("dbo.PageSections", "PageSectionOrder", c => c.Int(nullable: false));
-        }
-
-        public override void Down()
-        {
-            DropColumn("dbo.PageSections", "PageSectionOrder");
-        }
-    }
-}
\ No newline at end of file
diff --git a/Portal.CMS.Entities/Migrations/201607161849511_AddPageSectionOrderToPageSections.resx b/Portal.CMS.Entities/Migrations/201607161849511_AddPageSectionOrderToPageSections.resx
deleted file mode 100644
index df9e050..0000000
--- a/Portal.CMS.Entities/Migrations/201607161849511_AddPageSectionOrderToPageSections.resx
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <data name="Target" xml:space="preserve">
-    <value>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</value>
-  </data>
-  <data name="DefaultSchema" xml:space="preserve">
-    <value>dbo</value>
-  </data>
-</root>
\ No newline at end of file
diff --git a/Portal.CMS.Entities/Migrations/201607171344335_ExtendAnalyticStorage.Designer.cs b/Portal.CMS.Entities/Migrations/201607171344335_ExtendAnalyticStorage.Designer.cs
deleted file mode 100644
index e2902fb..0000000
--- a/Portal.CMS.Entities/Migrations/201607171344335_ExtendAnalyticStorage.Designer.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-// <auto-generated />
-namespace Portal.CMS.Entities.Migrations
-{
-    using System.CodeDom.Compiler;
-    using System.Data.Entity.Migrations;
-    using System.Data.Entity.Migrations.Infrastructure;
-    using System.Resources;
-    
-    [GeneratedCode("EntityFramework.Migrations", "6.1.3-40302")]
-    public sealed partial class ExtendAnalyticStorage : IMigrationMetadata
-    {
-        readonly ResourceManager Resources = new ResourceManager(typeof(ExtendAnalyticStorage));
-        
-        string IMigrationMetadata.Id
-        {
-            get { return "201607171344335_ExtendAnalyticStorage"; }
-        }
-        
-        string IMigrationMetadata.Source
-        {
-            get { return null; }
-        }
-        
-        string IMigrationMetadata.Target
-        {
-            get { return Resources.GetString("Target"); }
-        }
-    }
-}
diff --git a/Portal.CMS.Entities/Migrations/201607171344335_ExtendAnalyticStorage.cs b/Portal.CMS.Entities/Migrations/201607171344335_ExtendAnalyticStorage.cs
deleted file mode 100644
index 008814b..0000000
--- a/Portal.CMS.Entities/Migrations/201607171344335_ExtendAnalyticStorage.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-namespace Portal.CMS.Entities.Migrations
-{
-    using System.Data.Entity.Migrations;
-
-    public partial class ExtendAnalyticStorage : DbMigration
-    {
-        public override void Up()
-        {
-            AddColumn("dbo.AnalyticPageViews", "IPAddress", c => c.String(nullable: false));
-            AddColumn("dbo.AnalyticPageViews", "UserAgent", c => c.String(nullable: false));
-            AddColumn("dbo.AnalyticPostViews", "IPAddress", c => c.String(nullable: false));
-            AddColumn("dbo.AnalyticPostViews", "UserAgent", c => c.String(nullable: false));
-        }
-
-        public override void Down()
-        {
-            DropColumn("dbo.AnalyticPostViews", "UserAgent");
-            DropColumn("dbo.AnalyticPostViews", "IPAddress");
-            DropColumn("dbo.AnalyticPageViews", "UserAgent");
-            DropColumn("dbo.AnalyticPageViews", "IPAddress");
-        }
-    }
-}
\ No newline at end of file
diff --git a/Portal.CMS.Entities/Migrations/201607171344335_ExtendAnalyticStorage.resx b/Portal.CMS.Entities/Migrations/201607171344335_ExtendAnalyticStorage.resx
deleted file mode 100644
index 99e75d8..0000000
--- a/Portal.CMS.Entities/Migrations/201607171344335_ExtendAnalyticStorage.resx
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <data name="Target" xml:space="preserve">
-    <value>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</value>
-  </data>
-  <data name="DefaultSchema" xml:space="preserve">
-    <value>dbo</value>
-  </data>
-</root>
\ No newline at end of file
diff --git a/Portal.CMS.Entities/Migrations/201607171347205_RemoveRequirementForReferralAnalytic.Designer.cs b/Portal.CMS.Entities/Migrations/201607171347205_RemoveRequirementForReferralAnalytic.Designer.cs
deleted file mode 100644
index 31a7d3b..0000000
--- a/Portal.CMS.Entities/Migrations/201607171347205_RemoveRequirementForReferralAnalytic.Designer.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-// <auto-generated />
-namespace Portal.CMS.Entities.Migrations
-{
-    using System.CodeDom.Compiler;
-    using System.Data.Entity.Migrations;
-    using System.Data.Entity.Migrations.Infrastructure;
-    using System.Resources;
-    
-    [GeneratedCode("EntityFramework.Migrations", "6.1.3-40302")]
-    public sealed partial class RemoveRequirementForReferralAnalytic : IMigrationMetadata
-    {
-        readonly ResourceManager Resources = new ResourceManager(typeof(RemoveRequirementForReferralAnalytic));
-        
-        string IMigrationMetadata.Id
-        {
-            get { return "201607171347205_RemoveRequirementForReferralAnalytic"; }
-        }
-        
-        string IMigrationMetadata.Source
-        {
-            get { return null; }
-        }
-        
-        string IMigrationMetadata.Target
-        {
-            get { return Resources.GetString("Target"); }
-        }
-    }
-}
diff --git a/Portal.CMS.Entities/Migrations/201607171347205_RemoveRequirementForReferralAnalytic.cs b/Portal.CMS.Entities/Migrations/201607171347205_RemoveRequirementForReferralAnalytic.cs
deleted file mode 100644
index f9d5d0d..0000000
--- a/Portal.CMS.Entities/Migrations/201607171347205_RemoveRequirementForReferralAnalytic.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-namespace Portal.CMS.Entities.Migrations
-{
-    using System.Data.Entity.Migrations;
-
-    public partial class RemoveRequirementForReferralAnalytic : DbMigration
-    {
-        public override void Up()
-        {
-            AlterColumn("dbo.AnalyticPageViews", "ReferredUrl", c => c.String());
-            AlterColumn("dbo.AnalyticPostViews", "ReferredUrl", c => c.String());
-        }
-
-        public override void Down()
-        {
-            AlterColumn("dbo.AnalyticPostViews", "ReferredUrl", c => c.String(nullable: false));
-            AlterColumn("dbo.AnalyticPageViews", "ReferredUrl", c => c.String(nullable: false));
-        }
-    }
-}
\ No newline at end of file
diff --git a/Portal.CMS.Entities/Migrations/201607171347205_RemoveRequirementForReferralAnalytic.resx b/Portal.CMS.Entities/Migrations/201607171347205_RemoveRequirementForReferralAnalytic.resx
deleted file mode 100644
index 579ac82..0000000
--- a/Portal.CMS.Entities/Migrations/201607171347205_RemoveRequirementForReferralAnalytic.resx
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <data name="Target" xml:space="preserve">
-    <value>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</value>
-  </data>
-  <data name="DefaultSchema" xml:space="preserve">
-    <value>dbo</value>
-  </data>
-</root>
\ No newline at end of file
diff --git a/Portal.CMS.Entities/Migrations/201607211935456_AddAvatarPathToUserEntity.Designer.cs b/Portal.CMS.Entities/Migrations/201607211935456_AddAvatarPathToUserEntity.Designer.cs
deleted file mode 100644
index 785c9f7..0000000
--- a/Portal.CMS.Entities/Migrations/201607211935456_AddAvatarPathToUserEntity.Designer.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-// <auto-generated />
-namespace Portal.CMS.Entities.Migrations
-{
-    using System.CodeDom.Compiler;
-    using System.Data.Entity.Migrations;
-    using System.Data.Entity.Migrations.Infrastructure;
-    using System.Resources;
-    
-    [GeneratedCode("EntityFramework.Migrations", "6.1.3-40302")]
-    public sealed partial class AddAvatarPathToUserEntity : IMigrationMetadata
-    {
-        readonly ResourceManager Resources = new ResourceManager(typeof(AddAvatarPathToUserEntity));
-        
-        string IMigrationMetadata.Id
-        {
-            get { return "201607211935456_AddAvatarPathToUserEntity"; }
-        }
-        
-        string IMigrationMetadata.Source
-        {
-            get { return null; }
-        }
-        
-        string IMigrationMetadata.Target
-        {
-            get { return Resources.GetString("Target"); }
-        }
-    }
-}
diff --git a/Portal.CMS.Entities/Migrations/201607211935456_AddAvatarPathToUserEntity.cs b/Portal.CMS.Entities/Migrations/201607211935456_AddAvatarPathToUserEntity.cs
deleted file mode 100644
index 87e5706..0000000
--- a/Portal.CMS.Entities/Migrations/201607211935456_AddAvatarPathToUserEntity.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-namespace Portal.CMS.Entities.Migrations
-{
-    using System.Data.Entity.Migrations;
-
-    public partial class AddAvatarPathToUserEntity : DbMigration
-    {
-        public override void Up()
-        {
-            AddColumn("dbo.Users", "AvatarImagePath", c => c.String());
-        }
-
-        public override void Down()
-        {
-            DropColumn("dbo.Users", "AvatarImagePath");
-        }
-    }
-}
\ No newline at end of file
diff --git a/Portal.CMS.Entities/Migrations/201607211935456_AddAvatarPathToUserEntity.resx b/Portal.CMS.Entities/Migrations/201607211935456_AddAvatarPathToUserEntity.resx
deleted file mode 100644
index bb8bb08..0000000
--- a/Portal.CMS.Entities/Migrations/201607211935456_AddAvatarPathToUserEntity.resx
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <data name="Target" xml:space="preserve">
-    <value>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</value>
-  </data>
-  <data name="DefaultSchema" xml:space="preserve">
-    <value>dbo</value>
-  </data>
-</root>
\ No newline at end of file
diff --git a/Portal.CMS.Entities/Migrations/201607241651305_ExtendSectionTypeEntity.Designer.cs b/Portal.CMS.Entities/Migrations/201607241651305_ExtendSectionTypeEntity.Designer.cs
deleted file mode 100644
index 8b60bc5..0000000
--- a/Portal.CMS.Entities/Migrations/201607241651305_ExtendSectionTypeEntity.Designer.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-// <auto-generated />
-namespace Portal.CMS.Entities.Migrations
-{
-    using System.CodeDom.Compiler;
-    using System.Data.Entity.Migrations;
-    using System.Data.Entity.Migrations.Infrastructure;
-    using System.Resources;
-    
-    [GeneratedCode("EntityFramework.Migrations", "6.1.3-40302")]
-    public sealed partial class ExtendSectionTypeEntity : IMigrationMetadata
-    {
-        readonly ResourceManager Resources = new ResourceManager(typeof(ExtendSectionTypeEntity));
-        
-        string IMigrationMetadata.Id
-        {
-            get { return "201607241651305_ExtendSectionTypeEntity"; }
-        }
-        
-        string IMigrationMetadata.Source
-        {
-            get { return null; }
-        }
-        
-        string IMigrationMetadata.Target
-        {
-            get { return Resources.GetString("Target"); }
-        }
-    }
-}
diff --git a/Portal.CMS.Entities/Migrations/201607241651305_ExtendSectionTypeEntity.cs b/Portal.CMS.Entities/Migrations/201607241651305_ExtendSectionTypeEntity.cs
deleted file mode 100644
index e3afab3..0000000
--- a/Portal.CMS.Entities/Migrations/201607241651305_ExtendSectionTypeEntity.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-namespace Portal.CMS.Entities.Migrations
-{
-    using System.Data.Entity.Migrations;
-
-    public partial class ExtendSectionTypeEntity : DbMigration
-    {
-        public override void Up()
-        {
-            AddColumn("dbo.PageSectionTypes", "PageSectionTypeCategory", c => c.Int(nullable: false));
-            AddColumn("dbo.PageSectionTypes", "PageSectionTypeOrder", c => c.Int(nullable: false));
-        }
-
-        public override void Down()
-        {
-            DropColumn("dbo.PageSectionTypes", "PageSectionTypeOrder");
-            DropColumn("dbo.PageSectionTypes", "PageSectionTypeCategory");
-        }
-    }
-}
\ No newline at end of file
diff --git a/Portal.CMS.Entities/Migrations/201607241651305_ExtendSectionTypeEntity.resx b/Portal.CMS.Entities/Migrations/201607241651305_ExtendSectionTypeEntity.resx
deleted file mode 100644
index 8f36970..0000000
--- a/Portal.CMS.Entities/Migrations/201607241651305_ExtendSectionTypeEntity.resx
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <data name="Target" xml:space="preserve">
-    <value>H4sIAAAAAAAEAO1dW2/cuhF+L9D/sNintsjxxslLG9jnwHGSU6NxYmSdg74F8i5tC0crbSVtjo2iv6wP/Un9CyVFXXiZoUiJuiQ1AgReXmZ4+WY4Ioec//77Pyc/PeyixVeSZmESny6Pj54vFyTeJNswvjtdHvLbH/68/OnH3//u5O1297D4pSr3kpWjNePsdHmf5/tXq1W2uSe7IDvahZs0yZLb/GiT7FbBNlm9eP78L6vj4xWhJJaU1mJx8ukQ5+GOFD/oz/Mk3pB9fgiiy2RLoqxMpznrguriQ7Aj2T7YkNPlVZLmQXR0frk+ekuJ5CHJlouzKAxoU9Ykul0ugjhO8iCnDX31OSPrPE3iu/WeJgTR9eOe0HK3QZSRsgOvmuK2fXn+gvVl1VSsSG0OWZ7sHAkevywHZ6VW7zTEy3rw6PAVI/TIel0M4enyLA6ixzzcXAV35JeQ/LZcqExfnUcpqwCOdPNHRaj5qyL5bAFUfFZjh0KM/Xu2OD9E+SElpzE55GkQ0WqHmyjc/I08Xie/kvg0PkSR2BnaHZonJdCkqzTZkzR//ERukS5ebJeLlUxnpRKqyRho8EG5iPOXL5aLD7RxwU1EaiwJA7jOk5T8TGKSBjnZXgV5TlIKhYstKWZDa43C++LqbLtNSZZVLCmCqTQuF5fBw3sS3+X3p0v653LxLnwg2yqlbMbnOKTCSyvl6YEAzTSzpuKSnt3RZo7P+iwlgQeuZiZUz1BtEEUknaCDGy7SY/OlgkHSlGw/p9Hg4/uGAp6Cl9TSwhKuqaLvhMR2oRNpnKwaZWenApMs960CS5JPKvBJBbqzZuhxw/yTtLdK+3myf+ws4axy8d/UAs3a0EWIq3pjCS7jx/4aX3gY59fJ9nF8zv7EgFX8vN+ykXekZS0OFzuqzjvLQwGMcHNUUJlaJopGdBGKuuJoyxljeE6r3iVpA1D6rXqk5DjipahNW3PvWdVbo+mSxIeLnOw6A4oROKqoTA2oqh1dMCXWHQtWBc+e9sL7MP71mjxMYO0wzlN9EzHeU34LFn0f5IP3Q/A1vCvQBYBlufhEoiIzuw/3pQqqkPuFl3iXJrtPSSRAusj4sk4O6Yat6wmUex2kdyTvoUX6a5BZaI+ummNkrTGSiWYEIwNP1geRFeZgRFZ47YRI9s17nuz2SUzHlKV3hiej9PoQRluSHmlUp4as1qAu+AWJjAVmjfk0Hx9aM0Bjz1CqL783JNuk4X6a1VRqzRjfYE5y7E105yCtXQV0bJmcTgxHOUfgiJ/Ofiw6OpHtPIftDpNtwcZmTYrBgc0LocAXriAaC0PN04wMrUBvO6Ok5k1NlfTmoK3KpnRVWkL1MXVX309qoel25pA1OU9rqzW/j+m20W6WrTfKZX95VD9DUYHtoC64oW/RQqk83lihWGu7xbK9Pqa19vlVK3P5bFEErId6meKTRWA9naUkNGKagxOlEeg3E1imHy9nzWYvf0mWN63sKnyUCP+/IjW5zAlt6SRwSv3RpE3gO/WuVzGr8AJDc77IyBGWFTVTN0q1Ev2sUkrJA3TnANmuUB0botdhHk2xDFDW024d0QZMtPhQzmeH/D5J3Z1PZvtR3Evptpw1Z4VYZvdNu14nVPsEcU+N2Ki8/opRs7JR1enUwmS3o6KMq+6ywBeuOOUGinmg4pYKQHq7rXmFFwDeuCIbbFqTAzZMyO69nJSd9GEQcUpzWFzKpnQ2h5rqYy01PlSdDy/FsuvfnL+WUQ77qwdIfYH6w7ZZbL5bm8ULwc1iecZmFQV6bVhw9l1dsOkKzqC/KSodMVpTa4ZKxlxVgp1s+tMFb3dBGE3mZn0VZNlvSbodn/PP4VcST7Pr8i7YhdFE/rHztFDPvgZ5kA7lx2hSjUyVwUYTE0SWqylGKUMzmeTcXhZTRcqnWmT05qAaWTu6qseq7rdkLtm12QW1ZtDyEgBoi//UpVzO9WZeWIoQ2pr+VoVP8ZmD6HQVm7FFhvEbY4Fz+vrsd+mh+facxbWHuiGd9zbHvv5QM+UHkuLpjpwzwZeo5WDYasQSacatmLIMtBfD/4e+t8T8LntY/baH8Bahn6XWAromeV6oiI7iWdav/5haPstmdJFOoepYslmynOabpGT+SxAdfHC3g99hJ4BPuX91kb2LgrvmgRAf1+QGOcGlXd+SNHqkQyUiRR7tS7K7IWn12VtAhNYsRvt0+VybHKn4xYYdB5Vlj81l15uUEKpXkryu8cJcg904on2si7/UJ49Pk2HqDN7UnqbR6Ls/k2m9DNJfD3vbWX2dJHlG2e9tp7Z0csXm1XqiQBeOgaYJ4DXxJP2VBIW7id0ksTEvzkrspuiSbMPAVvAuw2zTT+pki83XFMomtncnM/cpe037YD9lPwfMD/wRmzJ4ZM+yLNmExTAp16L4xSeZ39t4uzDey2us6uZW7iUdnHBPh4OuhKfLP2mdwIjWe1syUZXg8VI1hz7Gb0hEcrLg3ukUzEG2oeDXbSHKWk4pXq5gRksQUQlgWiqMc93cCuNNuA8iU7OVSqCVBt/WYw2rWag5b8iexMysMs1DP941C2Ww2sbmZCWAyYwxzdsWQwTuegt657mADfeyl0nPD29Yy22mHb6/4wQ5bE76sZ8AdaKHsi1KQHdq71iEHLFxf9T5IxTojy1ajD7WvXALTKW3Ro2BZs0rCUUX7qIk74I5QRZ3CJWJNqb27FCKdcEKBkZfZDdgYvPjpx0jYVFyMDGhBvY2UUBTuWq5ARL2czODfB44hFpuO/0e4AfNST/2I6BOPm7EcIGcPTagaA667cEGH1kKRCGC0yMNbLbNPMMnf04wA+ehH+8xMVYcIrfCQT5R9oQx2dNDJjpjjInNtpln2GetG8bEeejHe+TV0wgz3CnS6+r5beENa/lIkMPm5JtAnXgWbEIGeDAMnKC7Ig46UBbogjTngTig5TYzjvhMOCMOmJCe7EdFXOs3AnTs7w1v397Xgd7uEb8N9LmY2ZcBP2RnJ1a0Rn0cwk9ueF4R0AM4GKIKuDwbysrzexU9rPaa5JWnsPIcebZcNCf8JYrUMgAkEaIJf7fdSDSpnotvIcpeIm4eoNHo8QepW2hUd7q02qXstVQX3tfTKDSnQxZEMAKtlbXzcogS8MyeBVmMklVlw8RIG8j2pEydk3aK20g2u0khTFDa0bOghhGxa0p96RFuSGXntpBidhZEgxu0FpVLP32QAP+sayGCEbCqLN6vBMfBTh4rHzWASO3+ppAQFK4u1+XLmEIZ8OlMVf+3nSHXzZY0iLaMtJ0aK2Q0EtJqQotZdFx/I0jvu/lkUzZIsLNNoemytjAMAnqaqRAbYhwkBdM+JOixm7FD0MGbj4GCjtpguqWO7T98+nVyYNDMpzstRzHQAHFdbBoZ9ERHISMuEF5GQ76bCg8Gfrxgd8Cg9qFeWVpGBDxSaBvXDuOg3J3RB8Gw222x3y20WFjQDH2Hd7gFMiCJPh3nq7Gh4/remMUmbPeOS9tgChnfyMf6bt4atNsc7Iv8McZBupQADwO6V2W1W6UMQmVOtQwBtD8lUIKp9BoCkwrE9k5sdk/69N+X6qvc4esv9TrvZMVDbJYJJyskFufJZbDfMxu2qVmmLNY8MOf5D2v3gJU7TmO1yYC4lXVra055ktJhUXLZJ/eWvAvTLH8T5MFNwDxRz7c7rZi+L4GY7RU/bOtBn7rKqq9qsr/FzRDZ8VXbqNC3dUpC72h/mSoouk4EBLSTWLDoqUEUpOqdayCw23kSHXYxnq+CFacuhG4TiQrJ9rSEWGwiLSHZnhZ/F1rqZ5FiT0F88FmkI6Y7tKfcaJBaBG4+mKhI4d5EUlKGPT3hlQCRmpDsNnsqtrBjF6Z4FMRrm5eakGl7vrL0usl2vQPoTbar/cIeso2SeJJt6CKoSAjbBMepPMmSmu8oS9LGd18xKrbJ3UUHroardB4eUVbnUKjFNir8AqVKh6e6UeKPYqmUeOo04JMefFGp1RmzgWFpYPcFIPi5Y4FApB6qU6tzYUmjYofFLXSabS2NGnZy0EqTv8uj0ePJs5n0Zr+677zX52PuU49XxUZYDBsoDjEeirCVGkTJiUoTElCk06S6UYLsXDHdjRpmg6t5jm3Uvg2a1Fkh3A+6OyLbEdW9cdgEqlPpYMvqRDMDnHX3nSb9ZNx9zixooAa1WlWzrqECDga7Wl2fZ6RIDx7w4mgo1oOX9Ki2kZ1UsiNH3WQEsmclLn4kpKNQuMkBBH13tMMA74JpfbFqUl3xAy+map5j+4AFX0x/+oaxlBFvn9KiY1M3iUFrm4AghO9SsYAGBmuj6UcYlTukSOu6LWtSqC6EsuvHvFC1DFyDEC5z5whjf3aRwYnFDc7uNtEIwMGtIa1AZ/pGcDYFOtPHLS2wUGc+ZmEQSsxHIGQfnt7iYPBSspEFY3XTbrt47VnddTddibajCuBfy53VlPqZyY4z6DZz/c9JWI1rHq9IJVQmu9HCv5XUTDe6gJarU90oyXGCVIpy7rdl3o4r41IMIWlHWcyYlWTXLlteVHXpNN9RU2O1jZPYBJnR5hALX2Oi6XYQOawikqLIyAdmQsawAjkRNLkDYF9MQm6NFmCEqw2LGDlaiUhLznGxJasIJLL9WKXaUxIiioikhGR7WmKIEJGYmP59LDFa6A/JT0XNnJXkcU9mH9IHOZRbSiBc1SSF1WseqiRir3yYqfWXaag9eFsmmm8/c91xnt3m2G08TVR0/dOkzmZmBGdqH8ZZV38PQ12j+QP5fUgZjuZU8ygvSBG6g9pKs7eJ5urdMhGU6vuZfYFU3eZ0hxFaExtaIViAOLho+AELWrrYSxnO9MqH/QGCZc7IANBuQahFau5lSv27vgVR3kCQrkYUo8AuOhS9z8rbEOqVBF5kuaBD9TXcsusI68csJ7sjVuBo/Y/oPArZ511d4DKIw1uS5fwd6+WL58cvlouzKAwyfjGlvGzxSn1awer2xfFLdvuCbHcrtbr7HQ5GJcu20m0KPc6H+cKCXWyNdvfl9iAbEA1+Hztko98aT8M1wMyVEmMx/hqkm/sg/cMuePijMznBP9oHOX5s3EIJDKxnuBzhpWHlabEPWpL/toe+aqEU2bdP3iX8oRxgrsCfn6hX5hsET8I2ibBV5pPtbD8hmUAO/Xbohd342xFb1RsQpc3NAB+oam4H+KDmDxFAmFhLWtbYgF7PswJH5/h5Sri4YZSY7K7fXVtoYXUddIX1HMA+73bTgHu5t8+EWHfAyajclgUW2lNmF/GWPJwu/1lUebW4+PsXXuvZonA/eLV4vviXM+PG396HWIse977o+Tb5Gp/7YdHaGaldUTo8QruuJvZRVM2+5JaRS9udxi0imEJEBhxexA/diz2Iu553V/pmB3Pvze5qeTghryvYuuJrBEj5RZG3z3jV9dtbAz2uPd+UiYp6T9ujGHWWtgOzUH1gTLvbSbxWLzsJ8Lt1b4NEwFdzrFSjrVDKDt7ev7KNXtHOUO2ztuNzOQRkNZ9qXwpPc6YegLAvc0H3l/aPL9TT2D7oPe5zaBf3Xqw/JKw0V+UhrSP9NXfr8ew6jiOMX+lH7GvT1b8JXDsS+6ImOxF3l+c5GEdO4mezQku1ey3PkqMxb8VN6FfLQV66DkoOc8q11HFN9QFFFICpxTTyWv2sK139WOKnJ2PJo3jKjxhrLALRjKxACLvxtaMPwIRv2Mmevn4Mqsrb1wc1weHXBznR5fd7+W4GTohVT9/hNn9hr1l7sYB9Ke1Eo6r7PWploG8WjHktB8bW89x1jrvO7whz27jfDvwx0flI1eC6avlZMcLRquIN2+OzeSpDBBolC85ltSGkDXRctcMM6qvajhih6oB4kdxffazBsvurt6VOD/hmCASjxG+R4rDxhAHjsOmxYzT+PLEtulyngG7I62e2570Ll/hthncEXfiNERyw2QMEAucoAVzksH3BwEEiweAxWhPq9EFAg7w0ZXvk6AQa81M9LiwnwA1+gABOo7gGwxHT/g+AZX7MpsMpy+Bwa+U+UjhTQ4gmNZqKck4CRNMbB2lFgBGlDUNhy/wyjOsJixuq4LdMuvAcOQQ4cJziOH0DQqcOuaii2DbkeGcgjRnyFn8jw4XlCLgxBAUTJo6HFBNmjCeMApomRKbAv0kcBC7IRWfbzRYnuBgu0LvwGxMrwK68PF/aXH3HWEGeH7E9kxgOKzi/kdej2cJluvVoTNC4rkeT4wYN1CdMXRnpT5i0MmU04OgtEFIHAQ32toP1zSBn2HjhOCpqZm37jg+Zse1ee8CMaPUqzyXUzhBqtEV16soXGKojXvXmvx4FXS/Cn0s4XW5vEjrvfENcLaVHwERZV/egDazrIkbWdZy4NtbFxVWdHU+GWNAcKK6zSrcEvUa4TIcoI8FSVcrN5rtGvMmC6KPB4kEWCHmcdDtZ/XqSzgMoAzEEgnnYcEcY4jzsyNYbkCD1OhdjgoVlN/EyDJ9UooWn5dBJu3A6Uykb5Cg/qGzDD+GD07fsRmX2wr2octFOILGhNV7cyteY8GSIOhwsGiLLv/VA0jwLIw8HJFdZIORx0nZkBUsAHHqDYsTjMWtcqmNunUedA3GoX5ZS6YPBqOVTWyAWteFYV7KZRD3bBHDSTQboOFapxRNVe809zrZ6yAhF2jYeRMpGoTDfTWAXUwcBdarFt/DfTUlltvfYcBxkOkSDu8Pzph8S7bAGCbJuONHRNx+URUN/z97YcWEZaN5R99NV6SwB6Sl+3uDeTHxfRh2ZKr13N+Wtb6CPhr1xYHdcaCdPMHRQXabk51A9do2vp4auQRtR2u6c0shJu6ZtLLaA03sHxwGnug+G9BLdKoM2y4TGlikt3dTrCakeu2hSMti2jgcV46d72nOMdd7JittSZQL9qT27eLL6dIiZxzn/9YZk4V1D4oTSjPkK1hCtylzEt0m1raK0qCqivbGRB9sgD87SPLwNNjnN3pAsK6y+wpePXU64IduL+OMh3x9y2mWyu4mkRYhtz5j4n6y0Np98LO6sZT66QJsZMif9j/HrQxht63a/A1w/ERJs36d0rmRzmTMny7vHmtIH+slsR6gcvnq76prs9hElln2M18FX0qVtVPm8J3fB5vGqfD0TJ9I+EfKwn7wJg7s02GUljaY+/UkxvN09/Pg/P7UE+Er5AAA=</value>
-  </data>
-  <data name="DefaultSchema" xml:space="preserve">
-    <value>dbo</value>
-  </data>
-</root>
\ No newline at end of file
diff --git a/Portal.CMS.Entities/Migrations/201607271844003_AddUserTokenEntity.Designer.cs b/Portal.CMS.Entities/Migrations/201607271844003_AddUserTokenEntity.Designer.cs
deleted file mode 100644
index fb95f44..0000000
--- a/Portal.CMS.Entities/Migrations/201607271844003_AddUserTokenEntity.Designer.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-// <auto-generated />
-namespace Portal.CMS.Entities.Migrations
-{
-    using System.CodeDom.Compiler;
-    using System.Data.Entity.Migrations;
-    using System.Data.Entity.Migrations.Infrastructure;
-    using System.Resources;
-    
-    [GeneratedCode("EntityFramework.Migrations", "6.1.3-40302")]
-    public sealed partial class AddUserTokenEntity : IMigrationMetadata
-    {
-        readonly ResourceManager Resources = new ResourceManager(typeof(AddUserTokenEntity));
-        
-        string IMigrationMetadata.Id
-        {
-            get { return "201607271844003_AddUserTokenEntity"; }
-        }
-        
-        string IMigrationMetadata.Source
-        {
-            get { return null; }
-        }
-        
-        string IMigrationMetadata.Target
-        {
-            get { return Resources.GetString("Target"); }
-        }
-    }
-}
diff --git a/Portal.CMS.Entities/Migrations/201607271844003_AddUserTokenEntity.cs b/Portal.CMS.Entities/Migrations/201607271844003_AddUserTokenEntity.cs
deleted file mode 100644
index b3a3a29..0000000
--- a/Portal.CMS.Entities/Migrations/201607271844003_AddUserTokenEntity.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-namespace Portal.CMS.Entities.Migrations
-{
-    using System.Data.Entity.Migrations;
-
-    public partial class AddUserTokenEntity : DbMigration
-    {
-        public override void Up()
-        {
-            CreateTable(
-                "dbo.UserTokens",
-                c => new
-                {
-                    UserTokenId = c.Int(nullable: false, identity: true),
-                    UserTokenType = c.Int(nullable: false),
-                    Token = c.String(nullable: false),
-                    UserId = c.Int(nullable: false),
-                    DateAdded = c.DateTime(nullable: false),
-                    DateRedeemed = c.DateTime(nullable: false),
-                })
-                .PrimaryKey(t => t.UserTokenId)
-                .ForeignKey("dbo.Users", t => t.UserId, cascadeDelete: true)
-                .Index(t => t.UserId);
-        }
-
-        public override void Down()
-        {
-            DropForeignKey("dbo.UserTokens", "UserId", "dbo.Users");
-            DropIndex("dbo.UserTokens", new[] { "UserId" });
-            DropTable("dbo.UserTokens");
-        }
-    }
-}
\ No newline at end of file
diff --git a/Portal.CMS.Entities/Migrations/201607271844003_AddUserTokenEntity.resx b/Portal.CMS.Entities/Migrations/201607271844003_AddUserTokenEntity.resx
deleted file mode 100644
index 826f149..0000000
--- a/Portal.CMS.Entities/Migrations/201607271844003_AddUserTokenEntity.resx
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <data name="Target" xml:space="preserve">
-    <value>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</value>
-  </data>
-  <data name="DefaultSchema" xml:space="preserve">
-    <value>dbo</value>
-  </data>
-</root>
\ No newline at end of file
diff --git a/Portal.CMS.Entities/Migrations/201607271854537_ExtendUserTokenEntity.Designer.cs b/Portal.CMS.Entities/Migrations/201607271854537_ExtendUserTokenEntity.Designer.cs
deleted file mode 100644
index eced8b2..0000000
--- a/Portal.CMS.Entities/Migrations/201607271854537_ExtendUserTokenEntity.Designer.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-// <auto-generated />
-namespace Portal.CMS.Entities.Migrations
-{
-    using System.CodeDom.Compiler;
-    using System.Data.Entity.Migrations;
-    using System.Data.Entity.Migrations.Infrastructure;
-    using System.Resources;
-    
-    [GeneratedCode("EntityFramework.Migrations", "6.1.3-40302")]
-    public sealed partial class ExtendUserTokenEntity : IMigrationMetadata
-    {
-        readonly ResourceManager Resources = new ResourceManager(typeof(ExtendUserTokenEntity));
-        
-        string IMigrationMetadata.Id
-        {
-            get { return "201607271854537_ExtendUserTokenEntity"; }
-        }
-        
-        string IMigrationMetadata.Source
-        {
-            get { return null; }
-        }
-        
-        string IMigrationMetadata.Target
-        {
-            get { return Resources.GetString("Target"); }
-        }
-    }
-}
diff --git a/Portal.CMS.Entities/Migrations/201607271854537_ExtendUserTokenEntity.cs b/Portal.CMS.Entities/Migrations/201607271854537_ExtendUserTokenEntity.cs
deleted file mode 100644
index 3b978fe..0000000
--- a/Portal.CMS.Entities/Migrations/201607271854537_ExtendUserTokenEntity.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-namespace Portal.CMS.Entities.Migrations
-{
-    using System.Data.Entity.Migrations;
-
-    public partial class ExtendUserTokenEntity : DbMigration
-    {
-        public override void Up()
-        {
-            AlterColumn("dbo.UserTokens", "DateRedeemed", c => c.DateTime());
-        }
-
-        public override void Down()
-        {
-            AlterColumn("dbo.UserTokens", "DateRedeemed", c => c.DateTime(nullable: false));
-        }
-    }
-}
\ No newline at end of file
diff --git a/Portal.CMS.Entities/Migrations/201607271854537_ExtendUserTokenEntity.resx b/Portal.CMS.Entities/Migrations/201607271854537_ExtendUserTokenEntity.resx
deleted file mode 100644
index 7c54939..0000000
--- a/Portal.CMS.Entities/Migrations/201607271854537_ExtendUserTokenEntity.resx
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <data name="Target" xml:space="preserve">
-    <value>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</value>
-  </data>
-  <data name="DefaultSchema" xml:space="preserve">
-    <value>dbo</value>
-  </data>
-</root>
\ No newline at end of file
diff --git a/Portal.CMS.Entities/Migrations/201607301215211_AddBioPropertyToUserEntity.Designer.cs b/Portal.CMS.Entities/Migrations/201607301215211_AddBioPropertyToUserEntity.Designer.cs
deleted file mode 100644
index fff40df..0000000
--- a/Portal.CMS.Entities/Migrations/201607301215211_AddBioPropertyToUserEntity.Designer.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-// <auto-generated />
-namespace Portal.CMS.Entities.Migrations
-{
-    using System.CodeDom.Compiler;
-    using System.Data.Entity.Migrations;
-    using System.Data.Entity.Migrations.Infrastructure;
-    using System.Resources;
-    
-    [GeneratedCode("EntityFramework.Migrations", "6.1.3-40302")]
-    public sealed partial class AddBioPropertyToUserEntity : IMigrationMetadata
-    {
-        readonly ResourceManager Resources = new ResourceManager(typeof(AddBioPropertyToUserEntity));
-        
-        string IMigrationMetadata.Id
-        {
-            get { return "201607301215211_AddBioPropertyToUserEntity"; }
-        }
-        
-        string IMigrationMetadata.Source
-        {
-            get { return null; }
-        }
-        
-        string IMigrationMetadata.Target
-        {
-            get { return Resources.GetString("Target"); }
-        }
-    }
-}
diff --git a/Portal.CMS.Entities/Migrations/201607301215211_AddBioPropertyToUserEntity.cs b/Portal.CMS.Entities/Migrations/201607301215211_AddBioPropertyToUserEntity.cs
deleted file mode 100644
index c7d0dd3..0000000
--- a/Portal.CMS.Entities/Migrations/201607301215211_AddBioPropertyToUserEntity.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-namespace Portal.CMS.Entities.Migrations
-{
-    using System.Data.Entity.Migrations;
-
-    public partial class AddBioPropertyToUserEntity : DbMigration
-    {
-        public override void Up()
-        {
-            AddColumn("dbo.Users", "Bio", c => c.String());
-        }
-
-        public override void Down()
-        {
-            DropColumn("dbo.Users", "Bio");
-        }
-    }
-}
\ No newline at end of file
diff --git a/Portal.CMS.Entities/Migrations/201607301215211_AddBioPropertyToUserEntity.resx b/Portal.CMS.Entities/Migrations/201607301215211_AddBioPropertyToUserEntity.resx
deleted file mode 100644
index f4c192e..0000000
--- a/Portal.CMS.Entities/Migrations/201607301215211_AddBioPropertyToUserEntity.resx
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <data name="Target" xml:space="preserve">
-    <value>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</value>
-  </data>
-  <data name="DefaultSchema" xml:space="preserve">
-    <value>dbo</value>
-  </data>
-</root>
\ No newline at end of file
diff --git a/Portal.CMS.Entities/Migrations/201607301802388_ChangeCopyEntityToNotRequireBody.Designer.cs b/Portal.CMS.Entities/Migrations/201607301802388_ChangeCopyEntityToNotRequireBody.Designer.cs
deleted file mode 100644
index 5f7ca17..0000000
--- a/Portal.CMS.Entities/Migrations/201607301802388_ChangeCopyEntityToNotRequireBody.Designer.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-// <auto-generated />
-namespace Portal.CMS.Entities.Migrations
-{
-    using System.CodeDom.Compiler;
-    using System.Data.Entity.Migrations;
-    using System.Data.Entity.Migrations.Infrastructure;
-    using System.Resources;
-    
-    [GeneratedCode("EntityFramework.Migrations", "6.1.3-40302")]
-    public sealed partial class ChangeCopyEntityToNotRequireBody : IMigrationMetadata
-    {
-        readonly ResourceManager Resources = new ResourceManager(typeof(ChangeCopyEntityToNotRequireBody));
-        
-        string IMigrationMetadata.Id
-        {
-            get { return "201607301802388_ChangeCopyEntityToNotRequireBody"; }
-        }
-        
-        string IMigrationMetadata.Source
-        {
-            get { return null; }
-        }
-        
-        string IMigrationMetadata.Target
-        {
-            get { return Resources.GetString("Target"); }
-        }
-    }
-}
diff --git a/Portal.CMS.Entities/Migrations/201607301802388_ChangeCopyEntityToNotRequireBody.cs b/Portal.CMS.Entities/Migrations/201607301802388_ChangeCopyEntityToNotRequireBody.cs
deleted file mode 100644
index b2c8f78..0000000
--- a/Portal.CMS.Entities/Migrations/201607301802388_ChangeCopyEntityToNotRequireBody.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-namespace Portal.CMS.Entities.Migrations
-{
-    using System.Data.Entity.Migrations;
-
-    public partial class ChangeCopyEntityToNotRequireBody : DbMigration
-    {
-        public override void Up()
-        {
-            AlterColumn("dbo.Copies", "CopyBody", c => c.String());
-        }
-
-        public override void Down()
-        {
-            AlterColumn("dbo.Copies", "CopyBody", c => c.String(nullable: false));
-        }
-    }
-}
\ No newline at end of file
diff --git a/Portal.CMS.Entities/Migrations/201607301802388_ChangeCopyEntityToNotRequireBody.resx b/Portal.CMS.Entities/Migrations/201607301802388_ChangeCopyEntityToNotRequireBody.resx
deleted file mode 100644
index 15530fb..0000000
--- a/Portal.CMS.Entities/Migrations/201607301802388_ChangeCopyEntityToNotRequireBody.resx
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <data name="Target" xml:space="preserve">
-    <value>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</value>
-  </data>
-  <data name="DefaultSchema" xml:space="preserve">
-    <value>dbo</value>
-  </data>
-</root>
\ No newline at end of file
diff --git a/Portal.CMS.Entities/Migrations/201607311849235_AddPostRolesEntity.Designer.cs b/Portal.CMS.Entities/Migrations/201607311849235_AddPostRolesEntity.Designer.cs
deleted file mode 100644
index f286a84..0000000
--- a/Portal.CMS.Entities/Migrations/201607311849235_AddPostRolesEntity.Designer.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-// <auto-generated />
-namespace Portal.CMS.Entities.Migrations
-{
-    using System.CodeDom.Compiler;
-    using System.Data.Entity.Migrations;
-    using System.Data.Entity.Migrations.Infrastructure;
-    using System.Resources;
-    
-    [GeneratedCode("EntityFramework.Migrations", "6.1.3-40302")]
-    public sealed partial class AddPostRolesEntity : IMigrationMetadata
-    {
-        readonly ResourceManager Resources = new ResourceManager(typeof(AddPostRolesEntity));
-        
-        string IMigrationMetadata.Id
-        {
-            get { return "201607311849235_AddPostRolesEntity"; }
-        }
-        
-        string IMigrationMetadata.Source
-        {
-            get { return null; }
-        }
-        
-        string IMigrationMetadata.Target
-        {
-            get { return Resources.GetString("Target"); }
-        }
-    }
-}
diff --git a/Portal.CMS.Entities/Migrations/201607311849235_AddPostRolesEntity.cs b/Portal.CMS.Entities/Migrations/201607311849235_AddPostRolesEntity.cs
deleted file mode 100644
index 8eab6f5..0000000
--- a/Portal.CMS.Entities/Migrations/201607311849235_AddPostRolesEntity.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-namespace Portal.CMS.Entities.Migrations
-{
-    using System.Data.Entity.Migrations;
-
-    public partial class AddPostRolesEntity : DbMigration
-    {
-        public override void Up()
-        {
-            CreateTable(
-                "dbo.PostRoles",
-                c => new
-                {
-                    PostRoleId = c.Int(nullable: false, identity: true),
-                    PostId = c.Int(nullable: false),
-                    RoleId = c.Int(nullable: false),
-                })
-                .PrimaryKey(t => t.PostRoleId)
-                .ForeignKey("dbo.Posts", t => t.PostId, cascadeDelete: true)
-                .ForeignKey("dbo.Roles", t => t.RoleId, cascadeDelete: true)
-                .Index(t => t.PostId)
-                .Index(t => t.RoleId);
-        }
-
-        public override void Down()
-        {
-            DropForeignKey("dbo.PostRoles", "RoleId", "dbo.Roles");
-            DropForeignKey("dbo.PostRoles", "PostId", "dbo.Posts");
-            DropIndex("dbo.PostRoles", new[] { "RoleId" });
-            DropIndex("dbo.PostRoles", new[] { "PostId" });
-            DropTable("dbo.PostRoles");
-        }
-    }
-}
\ No newline at end of file
diff --git a/Portal.CMS.Entities/Migrations/201607311849235_AddPostRolesEntity.resx b/Portal.CMS.Entities/Migrations/201607311849235_AddPostRolesEntity.resx
deleted file mode 100644
index 6da045c..0000000
--- a/Portal.CMS.Entities/Migrations/201607311849235_AddPostRolesEntity.resx
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <data name="Target" xml:space="preserve">
-    <value>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</value>
-  </data>
-  <data name="DefaultSchema" xml:space="preserve">
-    <value>dbo</value>
-  </data>
-</root>
\ No newline at end of file
diff --git a/Portal.CMS.Entities/Migrations/201608012107556_AddPageRolesEntity.Designer.cs b/Portal.CMS.Entities/Migrations/201608012107556_AddPageRolesEntity.Designer.cs
deleted file mode 100644
index 6538ea0..0000000
--- a/Portal.CMS.Entities/Migrations/201608012107556_AddPageRolesEntity.Designer.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-// <auto-generated />
-namespace Portal.CMS.Entities.Migrations
-{
-    using System.CodeDom.Compiler;
-    using System.Data.Entity.Migrations;
-    using System.Data.Entity.Migrations.Infrastructure;
-    using System.Resources;
-    
-    [GeneratedCode("EntityFramework.Migrations", "6.1.3-40302")]
-    public sealed partial class AddPageRolesEntity : IMigrationMetadata
-    {
-        readonly ResourceManager Resources = new ResourceManager(typeof(AddPageRolesEntity));
-        
-        string IMigrationMetadata.Id
-        {
-            get { return "201608012107556_AddPageRolesEntity"; }
-        }
-        
-        string IMigrationMetadata.Source
-        {
-            get { return null; }
-        }
-        
-        string IMigrationMetadata.Target
-        {
-            get { return Resources.GetString("Target"); }
-        }
-    }
-}
diff --git a/Portal.CMS.Entities/Migrations/201608012107556_AddPageRolesEntity.cs b/Portal.CMS.Entities/Migrations/201608012107556_AddPageRolesEntity.cs
deleted file mode 100644
index 03f6800..0000000
--- a/Portal.CMS.Entities/Migrations/201608012107556_AddPageRolesEntity.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-namespace Portal.CMS.Entities.Migrations
-{
-    using System.Data.Entity.Migrations;
-
-    public partial class AddPageRolesEntity : DbMigration
-    {
-        public override void Up()
-        {
-            CreateTable(
-                "dbo.PageRoles",
-                c => new
-                {
-                    PageRoleId = c.Int(nullable: false, identity: true),
-                    PageId = c.Int(nullable: false),
-                    RoleId = c.Int(nullable: false),
-                })
-                .PrimaryKey(t => t.PageRoleId)
-                .ForeignKey("dbo.Pages", t => t.PageId, cascadeDelete: true)
-                .ForeignKey("dbo.Roles", t => t.RoleId, cascadeDelete: true)
-                .Index(t => t.PageId)
-                .Index(t => t.RoleId);
-        }
-
-        public override void Down()
-        {
-            DropForeignKey("dbo.PageRoles", "RoleId", "dbo.Roles");
-            DropForeignKey("dbo.PageRoles", "PageId", "dbo.Pages");
-            DropIndex("dbo.PageRoles", new[] { "RoleId" });
-            DropIndex("dbo.PageRoles", new[] { "PageId" });
-            DropTable("dbo.PageRoles");
-        }
-    }
-}
\ No newline at end of file
diff --git a/Portal.CMS.Entities/Migrations/201608012107556_AddPageRolesEntity.resx b/Portal.CMS.Entities/Migrations/201608012107556_AddPageRolesEntity.resx
deleted file mode 100644
index ea2d3c8..0000000
--- a/Portal.CMS.Entities/Migrations/201608012107556_AddPageRolesEntity.resx
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <data name="Target" xml:space="preserve">
-    <value>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</value>
-  </data>
-  <data name="DefaultSchema" xml:space="preserve">
-    <value>dbo</value>
-  </data>
-</root>
\ No newline at end of file
diff --git a/Portal.CMS.Entities/Migrations/201609082029575_AddPageSectionRolesEntity.Designer.cs b/Portal.CMS.Entities/Migrations/201609082029575_AddPageSectionRolesEntity.Designer.cs
deleted file mode 100644
index 808c5f3..0000000
--- a/Portal.CMS.Entities/Migrations/201609082029575_AddPageSectionRolesEntity.Designer.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-// <auto-generated />
-namespace Portal.CMS.Entities.Migrations
-{
-    using System.CodeDom.Compiler;
-    using System.Data.Entity.Migrations;
-    using System.Data.Entity.Migrations.Infrastructure;
-    using System.Resources;
-    
-    [GeneratedCode("EntityFramework.Migrations", "6.1.3-40302")]
-    public sealed partial class AddPageSectionRolesEntity : IMigrationMetadata
-    {
-        readonly ResourceManager Resources = new ResourceManager(typeof(AddPageSectionRolesEntity));
-        
-        string IMigrationMetadata.Id
-        {
-            get { return "201609082029575_AddPageSectionRolesEntity"; }
-        }
-        
-        string IMigrationMetadata.Source
-        {
-            get { return null; }
-        }
-        
-        string IMigrationMetadata.Target
-        {
-            get { return Resources.GetString("Target"); }
-        }
-    }
-}
diff --git a/Portal.CMS.Entities/Migrations/201609082029575_AddPageSectionRolesEntity.cs b/Portal.CMS.Entities/Migrations/201609082029575_AddPageSectionRolesEntity.cs
deleted file mode 100644
index fc1c8df..0000000
--- a/Portal.CMS.Entities/Migrations/201609082029575_AddPageSectionRolesEntity.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-namespace Portal.CMS.Entities.Migrations
-{
-    using System.Data.Entity.Migrations;
-
-    public partial class AddPageSectionRolesEntity : DbMigration
-    {
-        public override void Up()
-        {
-            CreateTable(
-                "dbo.PageSectionRoles",
-                c => new
-                {
-                    PageSectionRoleId = c.Int(nullable: false, identity: true),
-                    PageSectionId = c.Int(nullable: false),
-                    RoleId = c.Int(nullable: false),
-                })
-                .PrimaryKey(t => t.PageSectionRoleId)
-                .ForeignKey("dbo.PageSections", t => t.PageSectionId, cascadeDelete: true)
-                .ForeignKey("dbo.Roles", t => t.RoleId, cascadeDelete: true)
-                .Index(t => t.PageSectionId)
-                .Index(t => t.RoleId);
-        }
-
-        public override void Down()
-        {
-            DropForeignKey("dbo.PageSectionRoles", "RoleId", "dbo.Roles");
-            DropForeignKey("dbo.PageSectionRoles", "PageSectionId", "dbo.PageSections");
-            DropIndex("dbo.PageSectionRoles", new[] { "RoleId" });
-            DropIndex("dbo.PageSectionRoles", new[] { "PageSectionId" });
-            DropTable("dbo.PageSectionRoles");
-        }
-    }
-}
\ No newline at end of file
diff --git a/Portal.CMS.Entities/Migrations/201609082029575_AddPageSectionRolesEntity.resx b/Portal.CMS.Entities/Migrations/201609082029575_AddPageSectionRolesEntity.resx
deleted file mode 100644
index 4b9a2db..0000000
--- a/Portal.CMS.Entities/Migrations/201609082029575_AddPageSectionRolesEntity.resx
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <data name="Target" xml:space="preserve">
-    <value>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</value>
-  </data>
-  <data name="DefaultSchema" xml:space="preserve">
-    <value>dbo</value>
-  </data>
-</root>
\ No newline at end of file
diff --git a/Portal.CMS.Entities/Migrations/201609152000410_ExtendPostToIncludeViews.Designer.cs b/Portal.CMS.Entities/Migrations/201609152000410_ExtendPostToIncludeViews.Designer.cs
deleted file mode 100644
index 609b804..0000000
--- a/Portal.CMS.Entities/Migrations/201609152000410_ExtendPostToIncludeViews.Designer.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-// <auto-generated />
-namespace Portal.CMS.Entities.Migrations
-{
-    using System.CodeDom.Compiler;
-    using System.Data.Entity.Migrations;
-    using System.Data.Entity.Migrations.Infrastructure;
-    using System.Resources;
-    
-    [GeneratedCode("EntityFramework.Migrations", "6.1.3-40302")]
-    public sealed partial class ExtendPostToIncludeViews : IMigrationMetadata
-    {
-        readonly ResourceManager Resources = new ResourceManager(typeof(ExtendPostToIncludeViews));
-        
-        string IMigrationMetadata.Id
-        {
-            get { return "201609152000410_ExtendPostToIncludeViews"; }
-        }
-        
-        string IMigrationMetadata.Source
-        {
-            get { return null; }
-        }
-        
-        string IMigrationMetadata.Target
-        {
-            get { return Resources.GetString("Target"); }
-        }
-    }
-}
diff --git a/Portal.CMS.Entities/Migrations/201609152000410_ExtendPostToIncludeViews.cs b/Portal.CMS.Entities/Migrations/201609152000410_ExtendPostToIncludeViews.cs
deleted file mode 100644
index 1c84de1..0000000
--- a/Portal.CMS.Entities/Migrations/201609152000410_ExtendPostToIncludeViews.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-namespace Portal.CMS.Entities.Migrations
-{
-    using System.Data.Entity.Migrations;
-
-    public partial class ExtendPostToIncludeViews : DbMigration
-    {
-        public override void Up()
-        {
-            CreateIndex("dbo.AnalyticPostViews", "PostId");
-            AddForeignKey("dbo.AnalyticPostViews", "PostId", "dbo.Posts", "PostId", cascadeDelete: true);
-        }
-
-        public override void Down()
-        {
-            DropForeignKey("dbo.AnalyticPostViews", "PostId", "dbo.Posts");
-            DropIndex("dbo.AnalyticPostViews", new[] { "PostId" });
-        }
-    }
-}
\ No newline at end of file
diff --git a/Portal.CMS.Entities/Migrations/201609152000410_ExtendPostToIncludeViews.resx b/Portal.CMS.Entities/Migrations/201609152000410_ExtendPostToIncludeViews.resx
deleted file mode 100644
index 96780fd..0000000
--- a/Portal.CMS.Entities/Migrations/201609152000410_ExtendPostToIncludeViews.resx
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <data name="Target" xml:space="preserve">
-    <value>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</value>
-  </data>
-  <data name="DefaultSchema" xml:space="preserve">
-    <value>dbo</value>
-  </data>
-</root>
\ No newline at end of file
diff --git a/Portal.CMS.Entities/Migrations/201609161855520_AddFontEntityForTheming.Designer.cs b/Portal.CMS.Entities/Migrations/201609161855520_AddFontEntityForTheming.Designer.cs
deleted file mode 100644
index aa4f142..0000000
--- a/Portal.CMS.Entities/Migrations/201609161855520_AddFontEntityForTheming.Designer.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-// <auto-generated />
-namespace Portal.CMS.Entities.Migrations
-{
-    using System.CodeDom.Compiler;
-    using System.Data.Entity.Migrations;
-    using System.Data.Entity.Migrations.Infrastructure;
-    using System.Resources;
-    
-    [GeneratedCode("EntityFramework.Migrations", "6.1.3-40302")]
-    public sealed partial class AddFontEntityForTheming : IMigrationMetadata
-    {
-        readonly ResourceManager Resources = new ResourceManager(typeof(AddFontEntityForTheming));
-        
-        string IMigrationMetadata.Id
-        {
-            get { return "201609161855520_AddFontEntityForTheming"; }
-        }
-        
-        string IMigrationMetadata.Source
-        {
-            get { return null; }
-        }
-        
-        string IMigrationMetadata.Target
-        {
-            get { return Resources.GetString("Target"); }
-        }
-    }
-}
diff --git a/Portal.CMS.Entities/Migrations/201609161855520_AddFontEntityForTheming.cs b/Portal.CMS.Entities/Migrations/201609161855520_AddFontEntityForTheming.cs
deleted file mode 100644
index 16ca428..0000000
--- a/Portal.CMS.Entities/Migrations/201609161855520_AddFontEntityForTheming.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-namespace Portal.CMS.Entities.Migrations
-{
-    using System.Data.Entity.Migrations;
-
-    public partial class AddFontEntityForTheming : DbMigration
-    {
-        public override void Up()
-        {
-            CreateTable(
-                "dbo.Fonts",
-                c => new
-                {
-                    FontId = c.Int(nullable: false, identity: true),
-                    FontName = c.String(nullable: false),
-                    FontType = c.String(nullable: false),
-                    FontPath = c.String(nullable: false),
-                    DateAdded = c.DateTime(nullable: false),
-                    DateUpdated = c.DateTime(nullable: false),
-                })
-                .PrimaryKey(t => t.FontId);
-        }
-
-        public override void Down()
-        {
-            DropTable("dbo.Fonts");
-        }
-    }
-}
\ No newline at end of file
diff --git a/Portal.CMS.Entities/Migrations/201609161855520_AddFontEntityForTheming.resx b/Portal.CMS.Entities/Migrations/201609161855520_AddFontEntityForTheming.resx
deleted file mode 100644
index ece94af..0000000
--- a/Portal.CMS.Entities/Migrations/201609161855520_AddFontEntityForTheming.resx
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <data name="Target" xml:space="preserve">
-    <value>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</value>
-  </data>
-  <data name="DefaultSchema" xml:space="preserve">
-    <value>dbo</value>
-  </data>
-</root>
\ No newline at end of file
diff --git a/Portal.CMS.Entities/Migrations/201609170832180_AddInitialThemeEntity.Designer.cs b/Portal.CMS.Entities/Migrations/201609170832180_AddInitialThemeEntity.Designer.cs
deleted file mode 100644
index 3678c2f..0000000
--- a/Portal.CMS.Entities/Migrations/201609170832180_AddInitialThemeEntity.Designer.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-// <auto-generated />
-namespace Portal.CMS.Entities.Migrations
-{
-    using System.CodeDom.Compiler;
-    using System.Data.Entity.Migrations;
-    using System.Data.Entity.Migrations.Infrastructure;
-    using System.Resources;
-    
-    [GeneratedCode("EntityFramework.Migrations", "6.1.3-40302")]
-    public sealed partial class AddInitialThemeEntity : IMigrationMetadata
-    {
-        readonly ResourceManager Resources = new ResourceManager(typeof(AddInitialThemeEntity));
-        
-        string IMigrationMetadata.Id
-        {
-            get { return "201609170832180_AddInitialThemeEntity"; }
-        }
-        
-        string IMigrationMetadata.Source
-        {
-            get { return null; }
-        }
-        
-        string IMigrationMetadata.Target
-        {
-            get { return Resources.GetString("Target"); }
-        }
-    }
-}
diff --git a/Portal.CMS.Entities/Migrations/201609170832180_AddInitialThemeEntity.cs b/Portal.CMS.Entities/Migrations/201609170832180_AddInitialThemeEntity.cs
deleted file mode 100644
index 6122ede..0000000
--- a/Portal.CMS.Entities/Migrations/201609170832180_AddInitialThemeEntity.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-namespace Portal.CMS.Entities.Migrations
-{
-    using System.Data.Entity.Migrations;
-
-    public partial class AddInitialThemeEntity : DbMigration
-    {
-        public override void Up()
-        {
-            CreateTable(
-                "dbo.Themes",
-                c => new
-                {
-                    ThemeId = c.Int(nullable: false, identity: true),
-                    ThemeName = c.String(nullable: false),
-                    IsDefault = c.Boolean(nullable: false),
-                    TitleFontId = c.Int(),
-                    TextFontId = c.Int(),
-                    DateAdded = c.DateTime(nullable: false),
-                    DateUpdated = c.DateTime(nullable: false),
-                })
-                .PrimaryKey(t => t.ThemeId)
-                .ForeignKey("dbo.Fonts", t => t.TextFontId)
-                .ForeignKey("dbo.Fonts", t => t.TitleFontId)
-                .Index(t => t.TitleFontId)
-                .Index(t => t.TextFontId);
-        }
-
-        public override void Down()
-        {
-            DropForeignKey("dbo.Themes", "TitleFontId", "dbo.Fonts");
-            DropForeignKey("dbo.Themes", "TextFontId", "dbo.Fonts");
-            DropIndex("dbo.Themes", new[] { "TextFontId" });
-            DropIndex("dbo.Themes", new[] { "TitleFontId" });
-            DropTable("dbo.Themes");
-        }
-    }
-}
\ No newline at end of file
diff --git a/Portal.CMS.Entities/Migrations/201609170832180_AddInitialThemeEntity.resx b/Portal.CMS.Entities/Migrations/201609170832180_AddInitialThemeEntity.resx
deleted file mode 100644
index 67575fc..0000000
--- a/Portal.CMS.Entities/Migrations/201609170832180_AddInitialThemeEntity.resx
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <data name="Target" xml:space="preserve">
-    <value>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</value>
-  </data>
-  <data name="DefaultSchema" xml:space="preserve">
-    <value>dbo</value>
-  </data>
-</root>
\ No newline at end of file
diff --git a/Portal.CMS.Entities/Migrations/201609170909041_ExtendPagesEntityWithTheme.Designer.cs b/Portal.CMS.Entities/Migrations/201609170909041_ExtendPagesEntityWithTheme.Designer.cs
deleted file mode 100644
index 4253fbe..0000000
--- a/Portal.CMS.Entities/Migrations/201609170909041_ExtendPagesEntityWithTheme.Designer.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-// <auto-generated />
-namespace Portal.CMS.Entities.Migrations
-{
-    using System.CodeDom.Compiler;
-    using System.Data.Entity.Migrations;
-    using System.Data.Entity.Migrations.Infrastructure;
-    using System.Resources;
-    
-    [GeneratedCode("EntityFramework.Migrations", "6.1.3-40302")]
-    public sealed partial class ExtendPagesEntityWithTheme : IMigrationMetadata
-    {
-        readonly ResourceManager Resources = new ResourceManager(typeof(ExtendPagesEntityWithTheme));
-        
-        string IMigrationMetadata.Id
-        {
-            get { return "201609170909041_ExtendPagesEntityWithTheme"; }
-        }
-        
-        string IMigrationMetadata.Source
-        {
-            get { return null; }
-        }
-        
-        string IMigrationMetadata.Target
-        {
-            get { return Resources.GetString("Target"); }
-        }
-    }
-}
diff --git a/Portal.CMS.Entities/Migrations/201609170909041_ExtendPagesEntityWithTheme.cs b/Portal.CMS.Entities/Migrations/201609170909041_ExtendPagesEntityWithTheme.cs
deleted file mode 100644
index 3423962..0000000
--- a/Portal.CMS.Entities/Migrations/201609170909041_ExtendPagesEntityWithTheme.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-namespace Portal.CMS.Entities.Migrations
-{
-    using System.Data.Entity.Migrations;
-
-    public partial class ExtendPagesEntityWithTheme : DbMigration
-    {
-        public override void Up()
-        {
-            AddColumn("dbo.Pages", "ThemeId", c => c.Int());
-            CreateIndex("dbo.Pages", "ThemeId");
-            AddForeignKey("dbo.Pages", "ThemeId", "dbo.Themes", "ThemeId");
-        }
-
-        public override void Down()
-        {
-            DropForeignKey("dbo.Pages", "ThemeId", "dbo.Themes");
-            DropIndex("dbo.Pages", new[] { "ThemeId" });
-            DropColumn("dbo.Pages", "ThemeId");
-        }
-    }
-}
\ No newline at end of file
diff --git a/Portal.CMS.Entities/Migrations/201609170909041_ExtendPagesEntityWithTheme.resx b/Portal.CMS.Entities/Migrations/201609170909041_ExtendPagesEntityWithTheme.resx
deleted file mode 100644
index 99429cb..0000000
--- a/Portal.CMS.Entities/Migrations/201609170909041_ExtendPagesEntityWithTheme.resx
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <data name="Target" xml:space="preserve">
-    <value>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</value>
-  </data>
-  <data name="DefaultSchema" xml:space="preserve">
-    <value>dbo</value>
-  </data>
-</root>
\ No newline at end of file
diff --git a/Portal.CMS.Entities/Migrations/201609171705597_RemoveThemeFromIndividualPages.Designer.cs b/Portal.CMS.Entities/Migrations/201609171705597_RemoveThemeFromIndividualPages.Designer.cs
deleted file mode 100644
index c2021bf..0000000
--- a/Portal.CMS.Entities/Migrations/201609171705597_RemoveThemeFromIndividualPages.Designer.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-// <auto-generated />
-namespace Portal.CMS.Entities.Migrations
-{
-    using System.CodeDom.Compiler;
-    using System.Data.Entity.Migrations;
-    using System.Data.Entity.Migrations.Infrastructure;
-    using System.Resources;
-    
-    [GeneratedCode("EntityFramework.Migrations", "6.1.3-40302")]
-    public sealed partial class RemoveThemeFromIndividualPages : IMigrationMetadata
-    {
-        readonly ResourceManager Resources = new ResourceManager(typeof(RemoveThemeFromIndividualPages));
-        
-        string IMigrationMetadata.Id
-        {
-            get { return "201609171705597_RemoveThemeFromIndividualPages"; }
-        }
-        
-        string IMigrationMetadata.Source
-        {
-            get { return null; }
-        }
-        
-        string IMigrationMetadata.Target
-        {
-            get { return Resources.GetString("Target"); }
-        }
-    }
-}
diff --git a/Portal.CMS.Entities/Migrations/201609171705597_RemoveThemeFromIndividualPages.cs b/Portal.CMS.Entities/Migrations/201609171705597_RemoveThemeFromIndividualPages.cs
deleted file mode 100644
index 02794ec..0000000
--- a/Portal.CMS.Entities/Migrations/201609171705597_RemoveThemeFromIndividualPages.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-namespace Portal.CMS.Entities.Migrations
-{
-    using System.Data.Entity.Migrations;
-
-    public partial class RemoveThemeFromIndividualPages : DbMigration
-    {
-        public override void Up()
-        {
-            DropForeignKey("dbo.Pages", "ThemeId", "dbo.Themes");
-            DropIndex("dbo.Pages", new[] { "ThemeId" });
-            DropColumn("dbo.Pages", "ThemeId");
-        }
-
-        public override void Down()
-        {
-            AddColumn("dbo.Pages", "ThemeId", c => c.Int());
-            CreateIndex("dbo.Pages", "ThemeId");
-            AddForeignKey("dbo.Pages", "ThemeId", "dbo.Themes", "ThemeId");
-        }
-    }
-}
\ No newline at end of file
diff --git a/Portal.CMS.Entities/Migrations/201609171705597_RemoveThemeFromIndividualPages.resx b/Portal.CMS.Entities/Migrations/201609171705597_RemoveThemeFromIndividualPages.resx
deleted file mode 100644
index 67575fc..0000000
--- a/Portal.CMS.Entities/Migrations/201609171705597_RemoveThemeFromIndividualPages.resx
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <data name="Target" xml:space="preserve">
-    <value>H4sIAAAAAAAEAO1dbW/cunL+XqD/YbGf2otzvXFOC/QG9r1w7JNT4x6fBHFy2m+Gsks7wtFKW0mbG6PoL+uH/qT+hZKiRPFlhiIl6mXTIIBj82U45DxDDskZ6n//+38u/vJ1n6y+kLyIs/RyfX72Yr0i6TbbxenT5fpYPv7xX9Z/+fPf/93FT7v919VvTbkfWTlaMy0u15/L8vBqsym2n8k+Ks728TbPiuyxPNtm+020yzYvX7z40+b8fEMoiTWltVpdvD+mZbwn1R/0z+ss3ZJDeYySu2xHkqJOpzn3FdXVr9GeFIdoSy7X77K8jJKz67v7s58okTImxXp1lcQRZeWeJI/rVZSmWRmVlNFXHwtyX+ZZ+nR/oAlR8uH5QGi5xygpSN2BV21x1768eMn6smkrNqS2x6LM9p4Ez3+sB2ejV+81xGsxeHT4qhF6Zr2uhvByfZVGyXMZb99FT+S3mPxtvdIbfXWd5KwCONLtLw2h9reG5A8roOIPAjsUYuzfD6vrY1Iec3KZkmOZRwmtdvyUxNu/kucP2e8kvUyPSSJ3hnaH5ikJNOldnh1IXj6/J49IF29369VGpbPRCQkyFhp8UG7T8seX69WvlLnoU0IElqQBvC+znPxMUpJHJdm9i8qS5BQKtztSScPgRmv79t3VbpeTomiapAim2rhe3UVffyHpU/n5ck1/Xa/exF/Jrkmp2fiYxlR5aaUyPxKATXvTVF3yqyfK5vRNX+UkCtCqvRE6z9DZIElIPkMHt1ylp26XKgbJc7L7mCejj+8NBTwFLxHawhI+0Im+FxK7lU6mcbFpJzu3KTArytBTYE3y+xT4fQr0b5qhxw/z37W9U9uvs8Nzbw1nlasfcys046GPEjf1plJc1h77bXrlYS2/znbPJ4R6VvHjYccG2pOWM/rfZGwi64n+D3S3Qf9jNObGP+OhD/6belPhn7U3D/5Zy6zNeVqmA/V5+pZPShVv99SQ6q2LFSTj7VlFZW5trJjoo46i4mSGJGvwmlZ9yvJ2aSDJ45mW44mXqnYg0PdC0x1Jj7cl2fcGFCNw1lCZG1ANH30wJdedClZVmwMt9V/i9PcP5OsM+wzW8lynEaztOU9hqr6PctT0a/QlfqrQBYBlvXpPkiqz+Bwf6imoQe4DL/Emz/bvs0SCdJXxcJ8d8y1b1zMo90OUP5FywCwyfAZZxOzRd+aYeNaYyDi0gpGBpxiCyAZzMCIbvPZCJDttus72hywljT3bE56M0utjnOxIfmZQnRuyBkN98AsSmQrMRuPzbHsMNkBjz1JqaHs3pNjm8WGe1VThJtDpR5jdDuOMTQ791TcrSq7EjMwS9JXx0VdNm7pTaufgo2Qnnl0XnnfV7hdYc5rheeAl2jVHyTCsIDUXsoJs3HBo2rjhJQBuqh8oN9WPQTbZuyHHBPqitwS96aszU+vLfAvYJHfffK2Yb+dVdXSmXecSDgq7Jkc2c8BWueMMqVvl8Pzpw9I9qeSFc1UXABmT80DelAKDNw01tWAzZ01vCRNozUrfeVSqfkrmh8S6297Gmdwk14RSe2/zXTvhjmpHOesjZL+ACttjurBPZFKhB0VvQW71YraJxCg7YMrjJw8Oo6yUxwdcKtY59nLZwZakNDahp8al7MskdgZOkXPs0pxn56k3a0Ixx1FkixagSh9kdyc3Am3y9PxOTodv+QZp59Wx/Mzgtq0qnS1BK/uq4tT6x9qbYtfXZ8YOevYt0ZwbG4BZN2DGnuPUW2p6viMDiYkpzn07mUCP3cEyw9rytqfd9S8rypbLYSfXEqnZdU7ipZfCafUn0zap3bkvTiupwkYFzXlQkSNZFHqmuYMxSgw7C6GUAkB3CZDtC9WpIfohLpM5lgHa9Ly3j5SBmRYf2jKze7PcP3JgsafDgybdDnfFolLL4nPL1+uMzj5ROnBGbKe84ROjsc9Cp04vDrP9nqoyPnXXBR74xKkyKOeBE7dSwPu8ic1VzJEUZ67KBllrc0DGpOw+bFnO8OpckCmRAfLU5vZhicWgdSzAdREAZFUOjjCePeywrUVDCMuRU1rCKlyz0ttubKtPtSaHWBNCxOLVXZ9niRywqFnVcPg8CmkhONG6ssXk3ckWLwSzxfKsbFUFBk0PvPkwR3yM1twzQ6NjvlOCm26Gmwt+2kdxMlsw8buoKP6W5bvpW/45/kLSmSLRon2czBQFukxT/upLVEb5WDFDZnuv42zC+AbcVmTKXhl9+uSrZBi2opo76DSkIRVy6l3CDUvDR98peOqblhAmWdgrTvSOUKBPvxxUMgxzQc0NZsI4qhDKzXDLRewmA2xrFhG9Khjpfb44dRSraJRfCso3LGrODJscx8FwVYQaadbjkLoMdB7Cf0KmvJzf5xxp2BENzhG64/FS0BChFjWZJahnb18eqe6kyrmopc0KV4ezOwis5snecGechqzhhSNn4NwM97u5J2VZWcc9FaeuL36ZW3VqNvpojlR1KsWpm5xno1g3/luUHEO03gt+1fs6Q1/nqf6bG3gVE31gJypOBbqqwXkgd1vckMeISsD7Ck7vA7tvBl826qhHvpY9qi3kTAVdYJpugYtMJe+Htki7yqg5xjKjZfuuekJGNq7aMgZbTRbGl8gffCpdaX7I85GK4NwzkmCk7wmJqDzlEUnVqLHJ03J8Zwsu36lnu+U5ZrwnO0J1ByAW5JSmGmfwmKbNAc9ppGw/ZT7uJVXW3rO6Ld4k0VP71HmIZ8dGcWekMNuRPHmmsJShokrkjuw/kby52qhUjNasjLfL9QtDgErx2y3zjarLntvL3m9zQqhgs1LUMJdHpQZbIGgfRfEfTeFxMVlEZ3mdIpAYrW+hLESs/C0sN5lSy6ksaOMHV8HWR0aOMmUTCyZRvfC/xbtKZevS/2Qv/fFWlPznnkgBHapHwgnQ1swo+VcSVc7fbjhh8e6VQ44bSu7ILo5cUXIXF9thaq+e3YYSoXrYHjzkw19kr2kf3EX2c8SeJ3jGROY0sprBFGhkMVN3AUP8JsufMmpvpq3DgeOCd/8Wwzs80ldFkW3jagSE0shvhqlt/ZTuVtzQQZ60a43c9kHLOzpG8YGOCjV6Ltd/MDqAERXXyCpRneC5yiMl+Da9IQkpyYo/T0GnjajY0mnG3DjQptWU6rl1BooooXMNW5LitDR3J3G6jQ9RYmNbqwRuauCH7hhjogk954YcSMp2IDY5DGtbNKENVtfYXGwkMNkxZsS2Y4jAA93BqCQfsOFvWqikl4c3jHMXscMP+HhBDpPJsOanRZ0R5eyAEjzkGcQivwXphUf8lQQn1C8KoVhfXNGCPpbSF7OYGIMwNAOKK5y5gkq9gRsFt8o1ntQERHd5SJW5d0EEfLM9CJuyjIaxMMNKLke7u6684GMqwdd36BkWuBW+y1gwUrH+eE5hrGpgWwAQZTCmJkKzWB+s+BWlMMT2mUZboidlixpsT2iIGnI4CSvUbeHuXLF7Y+z01ug5F+cTXJWNSF0UEnjYruqV6oUz/JEElWh74L04zGFdcJpfrO9z+OEPk08YPibCohJLaEMNHFiogaaJyvUDJBz7bQf5MnAIce4q/gDwg2QyrPkJUKdGfWC4QEJAVFcN31UWjhxZ/CoLsj3RKgvKYfGrrBrL0wkH1WEkEMbUgDuV6IIxJrPtImc4PLkfxmQ5DGt74tXTCjM8/j3o6nlaeMM4nwhymExOAnVybJYNGWCgFhDR5os4KMBLogvSXAbiAM5dJI7EMHojDhDIwOYnRVznHgEKwwuGt9PbHZh8T7g3MGWx+J2BGjRnQ4QoheHM+/wNflLrFFBmsD0hyAw5nA7G7Ge8cFxkIIyd1u4TZHuqM15IDovffYqTQf5KXudZrPZk3oSTDsoMgM6rNEqey3jbFOqG/rDjXWVUJpzTzFFY/KSmhd5hMsbi8FoZ13Gy7nMaErsnkeRRdyrFF2dnprdsL7TA7bsIrAnPHIAWeDxdGpfjQ+dEjAiL7JCvGSM5HDNGXOXUoNEZmBY1+pA6wUYOR57tYFUKv7MdgkKxeECkpe/ZKhDDt/jDLpjvCU9XTVks7KCLB16yICJaQ8RM8EgPnneX7UgCRJRQJuugkqKOn9XRw2rfk7KmKcwYuj2uXzFuoz51U6cuA0ASISqMPgtRYT91EL3ODs/tdyENeiy7kwabLKDKfILtqNy8mG3Urk9xOqo3ARAQhTYGxYEIRqCzshGACVEyCjmRZbqFUeP7OAciGAGnyhZoKH6Z7qRsfVJckDtIYnScx0VyOOzgx01erbNFDBNUHF4cqGFE3FgR7+TDjDTXQB2k2OwM0eBLoENlTEztradDZ9A5QjrtdSCDQk+cs3QQaR6IAmiIt6c6SPBnfgACtYXrMKTVOouNaW3uaGSkBdGcOnmk30oqo82fQCigYjHBwYCCdWWSNpb5rvA/jYxBQlntaTGHjhvhZ0Df7SFq6qkGFqQmsa7OpZZBQMPSNGKBx0H40YoZ3TokRnGnDum1OgaqVle3wTJoI+OGCSHA8PEppHvczENha6eU0+FQI6WcDktEQUoBVExZSbu1DQ0jseoKFEgSQgeh0BGYbm1MBBk+gWhswNoC9q6IctiguMGnJTPylNSpTK5a1Kk+Hh0fXWEMl22o83a/bvis3fDslgeBm5m2AUB9uTUysu0bZDTUD5DAg4E7FhudAF2L9T4Io7ljREBn4q5x7TEO2uPl5iBY/FyNQy2rOki2uqXvsG/rCOqgvZNu6bh5RAhzrJwR9u+4ciaokQmNfKzvdqdAFKzYCPRC/hTjoDwPDg8D6qVmMA75qWmD0GwzO4YA8kyTKMFUBg2BbQrEvKYQtm3Tn1f/x576VD8dpPOII4/BsunKo3HsYAmAzjtjdhw1gXDvEphj1ATy6/hkJlB9uG2xfwCfB9hqUb0e+lk+qrOCRAM4kB88CPoDt+Yg2O7hoStQ/SZe6kBzGGUZBeTuXSJSn/6H6nn7iC7adfhC2elKuVfnjUvkEXqvPzkKWzzYrajLvai2SDeniB1GD3ATOmC1bx4/FXdwIu9ic7+lox3VCRcbWmRLDuUxSqpLuaLJuIsOB3YG29asU1b3h2jLbrT+eL9efd0naXG5/lyWh1ebTVGRLs728TbPiuyxPNtm+020yzYvX7z40+b8fLPnNDZbZVbRbwxFS2WW0zVQy2WXaTvyJs6L8iYqo08Re5zuerc3ipk3jsihb9Medqloiq45EW5qst/la071LTzjCtK8sK0JvaH9ZXZf1XUCzYEoCUrkfhslUa5/RU2ryS6Br7PkuE/xfB2sOPXbd+IrgTJRKdmdFkP51VN1XSLTkpLdaV3lJNL6WaW4U2BAyjP2qqJKR0734Kc+7lU4Ai/1bFSqK/mc7D7miUpKyXCnJ70ULVOTkv2kp2MLczpgE4+GeMMtwVAybfLTtddPty3GTU/dbjwBBug2SuK7bkOfDpIJYS6bOJXvuqTne+qS4tIyVI0qBxh/1YGr4VP64Vkf1ibNZ2E41J9p1enwVD9K/DPXOiWeOg/4lM+N6NRExmJgyHcGQ/EH7XMc8AdXw0a28faUBxXzALVTMfHXpvpR4leFOiXIFaeLEv9Gr06Jp35HsgOS63PBoVAGT2kdsIzUQ62DJpBVsQ2w6NYOOu1tnEEN8+XqpGniUUpejNBbn52hchdumP6ix6tiI9zU0AEgp7vLq3kl26DkReWXOP2dfw5DptOm+lGCdmxyuh81bDep53nyaOxy29RFITwMunsi2xPVg3HIapgLdJu6GMkALtVDxWQ6YPvLzIEGujXUqxr7RKiAx9ZTr27KGSkyoA14cbQUG9DWDSm2eXwwpz57yZ4tmpsfIHtR6sIv4UJoCXSr6KgccFXbiLMakCo06X7ygyh5Hr4A/OC8zCjvMLLuKWc/GQ+XCqsBT2h95jDTOGlTfecL2HjS8zz5Aww8Of37ntVRR4IdAlo83R01Bq1tA4L0qQkdC5avUNhphlFG7bF2hLt+ZkxdGV6ClcxedN/mO0hd1dwlwjjcCi+H2Q2Cs/96L1W0AKff6h9aXU7CFgiDip5Q8JO/33jaqJi2QJu6GMkYYSEBVXfABtZKYeY5H9+4GgV607euK22B3vTxTTFYqHc79nVMKrEchVCjRAargyUOxkUXrNVRIUi1oKt+23P7blQB/Bu5ixJpGEn2lKCf5IY7Z7AalT+oSahO9qOFH2vpmX50gVlOpPpRYp/JzXLI8cPMPa2d6bQ6fltU3wYuPutcKhmL0mwRFBRkqq5fnOg5U2O1rULklUAZtlljeT+NOxHVHYC8dKSMcRVyJmhyp/OhmISc6B3ACFcbFzE/7aM4AV0e1RwfW7L5rrhqPzap7pR+jr+Q1LRZpGQPZ51oHyeAASSnfxtLzNWXqIxyxBvEyHSn+zrOVFpVwqI0N8yBhXg+qJ8G+x1cNDUgTfY/wAgzJ5zE4ZQUVBrChOjrQGapa12kIUcyJcNz0WfVTLdGLWtqQ8LXXW5GKAU6AW9e++oHJM8z77oGJKcep9xhAgxOYeq4b55aGyrumlAPaaM1sYGtK+hjKyW7C6muZBpDSoY3vd+i5AgTrHMWA4A6PHeo+Pmzev7CR+phw1sV1wUvEt3FVFUxhS4l+5w43JDH6JiU+nmDSPbgS34UWuHM9lq0hZ70NrlCzvJmOU5tCab+jCZ1Hcodwqbmz0f2M6qRujY7uKoCGcMiw8+urqqZJpaW5QFT/pqmglDogc0uvobb+6Eh/p7sCJ1TAHJtzsQgNx4H0IuI1usU8bd4HKAOzFdeDKhGgcX/V70v6kcC9Eh9XmS9okP1Jd6xKP3756Ik+zNW4Oz+P5LrJGYHkKLAXZTGj6QoKzxcrl++OH+5Xl0lcVTw9xrqNwhe6W+JOz1KcP4je5SA7PYbvbr/0waMSlHslEcGpLmhOZGwxvFf/JU866I2n3LXaZgIv9johC70kxGABn/iNmajX807PxMKDjYPv4vKkuR0SG/ZM/G0Q+vVr8ckiT6x1yseo6QwH9TFQ4l5K+mXKN9+jvJ/2Edf/9GbnBQ2HIIc90nsoFQ9R99BSHZGDMJY7YoYgpYS1hygr9KUyKmxJbuMme3UQ5oa/qwU5NnPTdnAwPrvyjaLsjUbaWkAjO9A3KY78vVy/Z9VlVer239/4LV+WFXOFq9WL1b/9V0BuhXADI93Az0cFN8N9KbeiOBu4+xDgLGNtV8UIJQ9kBctZ2gAX4pygga8a+yGRlNvRGi0IfAhoNGGwYeixm+ZQlA7KaRB37Z2ghpyOt6NNVFxzEVWjU13nboRQk7QMOcgZxnAAd5uYsBDurslIdcdURhNjK6fTcFrDbIp2uDyEGoth5eHohd6S9IGmI+L1t5I7YvS8RHad21yHreOwGm3QXSIkO4eUZDIiMOLBF0H2a/gcdb9J317NHVwtp1M3KHIM29s3QEH34u64aypOzK8euxZq1rD9qxm3xwa5rU8GvaSc18Z95XvBLINO1sEO07U45uDMRjQxjiprQgaIuyOYjTE0Q3MUvVvcb4CItT8eVAIhGIn2CmPGcUc/NjOGvrrDdUha6tGYmTIwsrhh5pvbMHtK/++Qp9A0m0M8cgGKRqC661CQ7ZB+HQ4ogqF3wIZkbsjEA61szKDc8NP0WhYqyO4rAFuDsjS6o8JKyMudky9NYJN3cez7zhOMH510Gqo+9PwpwUiajUUNTVitb8+L2F/4aV+jpfZbe1B9ooS1cq5+BSHneWgkFCPSQ6LAHWc49rqI6ooAFMHMfJawzYoczlDKOGrc54DOGPRjAh1AyHsA9qNPgAToWGnhpWGMaia0NIQ1KTo0iB34FJ86bdy9GTSMsJKA5w5VOGl4923waGa7urVd7Mp1/0WZ/elHSYgAZoeFnZfjwyl8si2thTkOWAbOdfCDI2SQ8t1tbFQ0/sYEo2/dMPMFAePs/mjLmx2AOMw3cSMhl52S1mqOqKQlWjOELaHGs053tIMxEe6iQQJiuwWiKg4ojikOMsQwpBCLV23wABPcoSln05KVTHFdLHy5KBMTwZEzSHtL8Ge9rJZgUhId6MVCX10s1pF5ZHNVimasr8tU4dShtC02UzpsNhsYy9xYu6TtvQZ5rqNxu31AfBkbL/7XGXWHFSfnuYJd3Qiiw9JvKVNXa7PjXjjt+kNSUhJVtyN43J9HRXbaGd2nLK7s7VdOQTr7fNElYc/GKSrWBqG6yi5ztKizKPYDFJ9l8fpNj5EidxfrRContgndy42gqSec0MOJGWapvdvWHuCrDayXf1Xvs1tx4p0YfUAuFe1IqsyZXHxhEngIjvO6CyI9FFAg3w+w9XFzAs09u8P+DQ5LW4Y9w+4b9MgMY4PqGpviXDD80YDlq+wLe/b94MZ8kBSj9ZnQBxwKNAK2JAqJMpvFlzOcsUehBoZTnizM6x4uJ8OKFLZHNZFyvP+HyyJ9g8U9HBmGn2h7Gx9IuSJxXKxhhY4Z428Ek5pYnktevNjZdHL3NRYmXphO5EVLSvKB4tLoCQzuZAiNyVjGvwwXzudh7HmGPtXRHwdJP1wBH/3ok+bE2Gp9s55ALwhPcU3InQaxzADxU36aEByFmYA4ODfU/BpcgLcNM4Uy12vhJuJ3H6bePLrleWx9IWtVwIrgFOdKi9DVt8wVpBPVbi6FI6HFby9idejxcJlvvVoStD4rkez46bySnqAXM5a0fFcWWh1ymTAMTmQUkcBDfaFBVOE6BcCPGETpMVJUbNo23d6yExt97oDZlart3ESXDZczFMakfhNgMX9RG8RWFnsDmkOrEx6oueDlWWc6LH3eotFTixX+uvGMh9m5slPNEaXFj/hVG6uwjkTBVGVKQuPJ6gCe3F2dm7IrKXB/YRlInXKKGI3u4MMP/aNEQ+xY1+WAVyeLR81mVLejTfwd4GPLXDbR3EmO0ir3GuXezTSOkrrDNSpJ38sYvugzqyHIj+p31kRodfaN1EM2NSfbmkCSvVPhqxaN2R9tRdF+HdWLte7TyxylHs066WMT9niTQsrAm9aFLE2LSyqrqarp+vN5ngy1ATNiUk3XT7VGnR5MkSX5XSTrbf+Bt06HSJcf7Gzi3LrlG0Qb7Mg+k2uWxMIeZx0N1nzOVqzDaAM1KBRzK11vm0CG+VZWFss160JhDxO2o2s8CADqYtcrJG6gFdblsFSSnS06TZ0SGN4C+4SUVwBbd2xw00q5NCu4r1hNqpkgy22JVxmMb7NBNvB6Tt2o7kugXvR5KKd4AW62+ImkNEIT4ao8+/Ru5BFwNVmYeQdQdYe9YJjZJnzpS81u7SCqaTIwtpw60gT8Wu2IHKgBsQ3Y7vo1zsSg3qdDtGuP0fqIuXafAXFXOdhcq6/5Ki3Iplx5vrLY7lWUhltFQaCvRRDXF5lq4858gTDDoWCtLRaPFHfBKjsO3TNCD0CemcPT1IPwySV4N9xrhIsHQRWOlFRpIfspnD+FdStPTaKB+0KVl/Wep0Gzws+JJxs91hAh7fG2bnEOcTuMrptRB44YN/idG8LVYC7xPMWoRwC5tggtAVCaz8o9IDS7kT3eLAetWuGwzHUPbtXsnGRoRuwnGklw9ZlySQVNQN1VfGHRXqK+8z6s2kOjWoUtyPTpA/upuq+CfTR4t85EKy6ySy+NB0IrKq3oa1r0KmhcYyqMTlr1wznuA5wBu/gNODUfbmQXqLuXgrLytapYrZO6eimWU9KDdhF2ySDuSYFmGLG717rJ4P0DnGkCdA5cy0UieG6hi7zuN/H0GV+gq5JXgi2NR7wUxgoN+zwv6ptZg7urHZbDnTWdp8OXLBK7PIES2eVo4qqSp0SqlviUhjvF3xvvNiOaXefyLqO3Y4GWNiVAyBRrU517l7zqo+4phN5Fxt+flQn0D/LLKfT8V22I0lRpV5s3h9T9nIQ/+uGFPFTS+KC0kz5Tq0l2pS5TR+z5nZS46gpor1cdEfKaBeV0VVexo/RtqTZW1IU1Tld9RAde1H4E9ndpm+P5eFY0i6T/adEMdvZLaet/YuNwfPF2+qh+SJEFyibMXts6W36+hgnO8H3G+AlMIQEuz6tX9lisizZa1tPz4LSr1nqSKgePnHr+4HsDwklVrxN76MvpA9vFH+/kKdo+0zTv8TVlycwIt2CUIf94iaOnvJoX9Q02vr0T4rh3f7rn/8PI9kRhZl2AQA=</value>
-  </data>
-  <data name="DefaultSchema" xml:space="preserve">
-    <value>dbo</value>
-  </data>
-</root>
\ No newline at end of file
diff --git a/Portal.CMS.Entities/Migrations/201609221930047_ExtendThemePropertiesWithFontSizes.Designer.cs b/Portal.CMS.Entities/Migrations/201609221930047_ExtendThemePropertiesWithFontSizes.Designer.cs
deleted file mode 100644
index 95a88bb..0000000
--- a/Portal.CMS.Entities/Migrations/201609221930047_ExtendThemePropertiesWithFontSizes.Designer.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-// <auto-generated />
-namespace Portal.CMS.Entities.Migrations
-{
-    using System.CodeDom.Compiler;
-    using System.Data.Entity.Migrations;
-    using System.Data.Entity.Migrations.Infrastructure;
-    using System.Resources;
-    
-    [GeneratedCode("EntityFramework.Migrations", "6.1.3-40302")]
-    public sealed partial class ExtendThemePropertiesWithFontSizes : IMigrationMetadata
-    {
-        readonly ResourceManager Resources = new ResourceManager(typeof(ExtendThemePropertiesWithFontSizes));
-        
-        string IMigrationMetadata.Id
-        {
-            get { return "201609221930047_ExtendThemePropertiesWithFontSizes"; }
-        }
-        
-        string IMigrationMetadata.Source
-        {
-            get { return null; }
-        }
-        
-        string IMigrationMetadata.Target
-        {
-            get { return Resources.GetString("Target"); }
-        }
-    }
-}
diff --git a/Portal.CMS.Entities/Migrations/201609221930047_ExtendThemePropertiesWithFontSizes.cs b/Portal.CMS.Entities/Migrations/201609221930047_ExtendThemePropertiesWithFontSizes.cs
deleted file mode 100644
index 4465e9e..0000000
--- a/Portal.CMS.Entities/Migrations/201609221930047_ExtendThemePropertiesWithFontSizes.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-namespace Portal.CMS.Entities.Migrations
-{
-    using System.Data.Entity.Migrations;
-
-    public partial class ExtendThemePropertiesWithFontSizes : DbMigration
-    {
-        public override void Up()
-        {
-            AddColumn("dbo.Themes", "TitleLargeFontSize", c => c.Int(nullable: false));
-            AddColumn("dbo.Themes", "TitleMediumFontSize", c => c.Int(nullable: false));
-            AddColumn("dbo.Themes", "TitleSmallFontSize", c => c.Int(nullable: false));
-            AddColumn("dbo.Themes", "TitleTinyFontSize", c => c.Int(nullable: false));
-            AddColumn("dbo.Themes", "TextStandardFontSize", c => c.Int(nullable: false));
-        }
-
-        public override void Down()
-        {
-            DropColumn("dbo.Themes", "TextStandardFontSize");
-            DropColumn("dbo.Themes", "TitleTinyFontSize");
-            DropColumn("dbo.Themes", "TitleSmallFontSize");
-            DropColumn("dbo.Themes", "TitleMediumFontSize");
-            DropColumn("dbo.Themes", "TitleLargeFontSize");
-        }
-    }
-}
\ No newline at end of file
diff --git a/Portal.CMS.Entities/Migrations/201609221930047_ExtendThemePropertiesWithFontSizes.resx b/Portal.CMS.Entities/Migrations/201609221930047_ExtendThemePropertiesWithFontSizes.resx
deleted file mode 100644
index 0157438..0000000
--- a/Portal.CMS.Entities/Migrations/201609221930047_ExtendThemePropertiesWithFontSizes.resx
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <data name="Target" xml:space="preserve">
-    <value>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</value>
-  </data>
-  <data name="DefaultSchema" xml:space="preserve">
-    <value>dbo</value>
-  </data>
-</root>
\ No newline at end of file
diff --git a/Portal.CMS.Entities/Migrations/201609241552502_UpdateMenuItemEntityWithLinkURLAndRoles.Designer.cs b/Portal.CMS.Entities/Migrations/201609241552502_UpdateMenuItemEntityWithLinkURLAndRoles.Designer.cs
deleted file mode 100644
index 32e8b8c..0000000
--- a/Portal.CMS.Entities/Migrations/201609241552502_UpdateMenuItemEntityWithLinkURLAndRoles.Designer.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-// <auto-generated />
-namespace Portal.CMS.Entities.Migrations
-{
-    using System.CodeDom.Compiler;
-    using System.Data.Entity.Migrations;
-    using System.Data.Entity.Migrations.Infrastructure;
-    using System.Resources;
-    
-    [GeneratedCode("EntityFramework.Migrations", "6.1.3-40302")]
-    public sealed partial class UpdateMenuItemEntityWithLinkURLAndRoles : IMigrationMetadata
-    {
-        readonly ResourceManager Resources = new ResourceManager(typeof(UpdateMenuItemEntityWithLinkURLAndRoles));
-        
-        string IMigrationMetadata.Id
-        {
-            get { return "201609241552502_UpdateMenuItemEntityWithLinkURLAndRoles"; }
-        }
-        
-        string IMigrationMetadata.Source
-        {
-            get { return null; }
-        }
-        
-        string IMigrationMetadata.Target
-        {
-            get { return Resources.GetString("Target"); }
-        }
-    }
-}
diff --git a/Portal.CMS.Entities/Migrations/201609241552502_UpdateMenuItemEntityWithLinkURLAndRoles.cs b/Portal.CMS.Entities/Migrations/201609241552502_UpdateMenuItemEntityWithLinkURLAndRoles.cs
deleted file mode 100644
index 2637fd5..0000000
--- a/Portal.CMS.Entities/Migrations/201609241552502_UpdateMenuItemEntityWithLinkURLAndRoles.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-namespace Portal.CMS.Entities.Migrations
-{
-    using System.Data.Entity.Migrations;
-
-    public partial class UpdateMenuItemEntityWithLinkURLAndRoles : DbMigration
-    {
-        public override void Up()
-        {
-            CreateTable(
-                "dbo.MenuItemRoles",
-                c => new
-                {
-                    MenuItemRoleId = c.Int(nullable: false, identity: true),
-                    MenuItemId = c.Int(nullable: false),
-                    RoleId = c.Int(nullable: false),
-                })
-                .PrimaryKey(t => t.MenuItemRoleId)
-                .ForeignKey("dbo.MenuItems", t => t.MenuItemId, cascadeDelete: true)
-                .ForeignKey("dbo.Roles", t => t.RoleId, cascadeDelete: true)
-                .Index(t => t.MenuItemId)
-                .Index(t => t.RoleId);
-
-            AddColumn("dbo.MenuItems", "LinkURL", c => c.String(nullable: false));
-            DropColumn("dbo.MenuItems", "LinkAction");
-            DropColumn("dbo.MenuItems", "LinkController");
-            DropColumn("dbo.MenuItems", "LinkArea");
-        }
-
-        public override void Down()
-        {
-            AddColumn("dbo.MenuItems", "LinkArea", c => c.String());
-            AddColumn("dbo.MenuItems", "LinkController", c => c.String(nullable: false));
-            AddColumn("dbo.MenuItems", "LinkAction", c => c.String(nullable: false));
-            DropForeignKey("dbo.MenuItemRoles", "RoleId", "dbo.Roles");
-            DropForeignKey("dbo.MenuItemRoles", "MenuItemId", "dbo.MenuItems");
-            DropIndex("dbo.MenuItemRoles", new[] { "RoleId" });
-            DropIndex("dbo.MenuItemRoles", new[] { "MenuItemId" });
-            DropColumn("dbo.MenuItems", "LinkURL");
-            DropTable("dbo.MenuItemRoles");
-        }
-    }
-}
\ No newline at end of file
diff --git a/Portal.CMS.Entities/Migrations/201609241552502_UpdateMenuItemEntityWithLinkURLAndRoles.resx b/Portal.CMS.Entities/Migrations/201609241552502_UpdateMenuItemEntityWithLinkURLAndRoles.resx
deleted file mode 100644
index 9ed6835..0000000
--- a/Portal.CMS.Entities/Migrations/201609241552502_UpdateMenuItemEntityWithLinkURLAndRoles.resx
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <data name="Target" xml:space="preserve">
-    <value>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</value>
-  </data>
-  <data name="DefaultSchema" xml:space="preserve">
-    <value>dbo</value>
-  </data>
-</root>
\ No newline at end of file
diff --git a/Portal.CMS.Entities/Migrations/201609241939510_ExtendMenuItemWithLinkIcon.Designer.cs b/Portal.CMS.Entities/Migrations/201609241939510_ExtendMenuItemWithLinkIcon.Designer.cs
deleted file mode 100644
index 15d0a87..0000000
--- a/Portal.CMS.Entities/Migrations/201609241939510_ExtendMenuItemWithLinkIcon.Designer.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-// <auto-generated />
-namespace Portal.CMS.Entities.Migrations
-{
-    using System.CodeDom.Compiler;
-    using System.Data.Entity.Migrations;
-    using System.Data.Entity.Migrations.Infrastructure;
-    using System.Resources;
-    
-    [GeneratedCode("EntityFramework.Migrations", "6.1.3-40302")]
-    public sealed partial class ExtendMenuItemWithLinkIcon : IMigrationMetadata
-    {
-        readonly ResourceManager Resources = new ResourceManager(typeof(ExtendMenuItemWithLinkIcon));
-        
-        string IMigrationMetadata.Id
-        {
-            get { return "201609241939510_ExtendMenuItemWithLinkIcon"; }
-        }
-        
-        string IMigrationMetadata.Source
-        {
-            get { return null; }
-        }
-        
-        string IMigrationMetadata.Target
-        {
-            get { return Resources.GetString("Target"); }
-        }
-    }
-}
diff --git a/Portal.CMS.Entities/Migrations/201609241939510_ExtendMenuItemWithLinkIcon.cs b/Portal.CMS.Entities/Migrations/201609241939510_ExtendMenuItemWithLinkIcon.cs
deleted file mode 100644
index 12e8bbe..0000000
--- a/Portal.CMS.Entities/Migrations/201609241939510_ExtendMenuItemWithLinkIcon.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-namespace Portal.CMS.Entities.Migrations
-{
-    using System.Data.Entity.Migrations;
-
-    public partial class ExtendMenuItemWithLinkIcon : DbMigration
-    {
-        public override void Up()
-        {
-            AddColumn("dbo.MenuItems", "LinkIcon", c => c.String());
-        }
-
-        public override void Down()
-        {
-            DropColumn("dbo.MenuItems", "LinkIcon");
-        }
-    }
-}
\ No newline at end of file
diff --git a/Portal.CMS.Entities/Migrations/201609241939510_ExtendMenuItemWithLinkIcon.resx b/Portal.CMS.Entities/Migrations/201609241939510_ExtendMenuItemWithLinkIcon.resx
deleted file mode 100644
index 6aa6d8e..0000000
--- a/Portal.CMS.Entities/Migrations/201609241939510_ExtendMenuItemWithLinkIcon.resx
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <data name="Target" xml:space="preserve">
-    <value>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</value>
-  </data>
-  <data name="DefaultSchema" xml:space="preserve">
-    <value>dbo</value>
-  </data>
-</root>
\ No newline at end of file
diff --git a/Portal.CMS.Entities/Migrations/201609262043195_ExtendThemeEntityWithColourOptions.Designer.cs b/Portal.CMS.Entities/Migrations/201609262043195_ExtendThemeEntityWithColourOptions.Designer.cs
deleted file mode 100644
index ea08b17..0000000
--- a/Portal.CMS.Entities/Migrations/201609262043195_ExtendThemeEntityWithColourOptions.Designer.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-// <auto-generated />
-namespace Portal.CMS.Entities.Migrations
-{
-    using System.CodeDom.Compiler;
-    using System.Data.Entity.Migrations;
-    using System.Data.Entity.Migrations.Infrastructure;
-    using System.Resources;
-    
-    [GeneratedCode("EntityFramework.Migrations", "6.1.3-40302")]
-    public sealed partial class ExtendThemeEntityWithColourOptions : IMigrationMetadata
-    {
-        readonly ResourceManager Resources = new ResourceManager(typeof(ExtendThemeEntityWithColourOptions));
-        
-        string IMigrationMetadata.Id
-        {
-            get { return "201609262043195_ExtendThemeEntityWithColourOptions"; }
-        }
-        
-        string IMigrationMetadata.Source
-        {
-            get { return null; }
-        }
-        
-        string IMigrationMetadata.Target
-        {
-            get { return Resources.GetString("Target"); }
-        }
-    }
-}
diff --git a/Portal.CMS.Entities/Migrations/201609262043195_ExtendThemeEntityWithColourOptions.cs b/Portal.CMS.Entities/Migrations/201609262043195_ExtendThemeEntityWithColourOptions.cs
deleted file mode 100644
index 1a89526..0000000
--- a/Portal.CMS.Entities/Migrations/201609262043195_ExtendThemeEntityWithColourOptions.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-namespace Portal.CMS.Entities.Migrations
-{
-    using System.Data.Entity.Migrations;
-
-    public partial class ExtendThemeEntityWithColourOptions : DbMigration
-    {
-        public override void Up()
-        {
-            AddColumn("dbo.Themes", "PageBackgroundColour", c => c.String(nullable: false));
-            AddColumn("dbo.Themes", "MenuBackgroundColour", c => c.String(nullable: false));
-            AddColumn("dbo.Themes", "MenuTextColour", c => c.String(nullable: false));
-        }
-
-        public override void Down()
-        {
-            DropColumn("dbo.Themes", "MenuTextColour");
-            DropColumn("dbo.Themes", "MenuBackgroundColour");
-            DropColumn("dbo.Themes", "PageBackgroundColour");
-        }
-    }
-}
\ No newline at end of file
diff --git a/Portal.CMS.Entities/Migrations/201609262043195_ExtendThemeEntityWithColourOptions.resx b/Portal.CMS.Entities/Migrations/201609262043195_ExtendThemeEntityWithColourOptions.resx
deleted file mode 100644
index 3d73698..0000000
--- a/Portal.CMS.Entities/Migrations/201609262043195_ExtendThemeEntityWithColourOptions.resx
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <data name="Target" xml:space="preserve">
-    <value>H4sIAAAAAAAEAO1dW2/cyHJ+D5D/MJin5GCPxvImQI4hnQNZXm+EY60Fj73Jm0APWxKxHHJCcrzWCfLL8pCflL8QdjcvfalqdpPNyziGAVnqS3V111fV1yr+73//z8Vfvu7j1ReS5VGaXK7Pz16sVyTZpWGUPF6uj8XDH/9l/Zc///3fXfwU7r+ufq3L/UjLlTWT/HL9VBSHV5tNvnsi+yA/20e7LM3Th+Jsl+43QZhuXr548afN+fmGlCTWJa3V6uLDMSmiPWF/lH9ep8mOHIpjEN+mIYnzKr3M2TKqq1+CPckPwY5cru/SrAjis+vb7dlPJZEiIvl6dRVHQcnKlsQP61WQJGkRFCWjrz7lZFtkafK4PZQJQfzx+UDKcg9BnJOqA6/a4rZ9efGS9mXTVqxJ7Y55ke4dCZ7/WA3ORq3ea4jXzeCVw8dG6Jn2mg3h5foqCeLnItrdBY/k14j8vl6pjb66jjNaARzp9peaUPtbTfKHFVDxhwY7JcTovx9W18e4OGbkMiHHIgvistrxcxzt/kqeP6a/keQyOcax2JmyO2WelFAm3WXpgWTF8wfygHTxJlyvNjKdjUqoIWOgwQflJil+fLle/VIyF3yOSYMlYQC3RZqRn0lCsqAg4V1QFCQroXATEiYNjRul7Zu7qzDMSJ7XTZYILrVxvboNvr4jyWPxdLkuf12v3kZfSVinVGx8SqJSectKRXYkAJvmpkt1ya4eSzanb/oqI4GHVs2NlHamtAZxTLIZOrjjKj11u6VikCwj4acsHn1835SAL8FLGm2hCR9LQ98Lid1KJ9K42LTGzs4Epnnh2wRWJL+bwO8m0L1pih43zH/X9k5tv04Pz701nFZmP+ZWaMpDHyWu602luLQ9+tv0ykNbfp2GzyeEelrx0yGkA+1Iyxr9b1NqyHqi/2O52yj/ozTmxj/loQ/+63pT4Z+2Nw/+acu0zXlaLgfqafqWT0oVb/blQqq3LjJIRrszRmVubWRM9FHHpuJkC0na4HVZ9THN2qmBxA9nSo4jXlhtT6DvhaZbkhxvCrL/kMb9QUWJnImU5gaWyEsffKn1p4JZ3e7g1bsV3wqNX4Iv0SPrBsLVevWBxKxA/hQdKvyLQ3XflnybpSxJHsumwP02PWY7OsmkplIfg+yRFPacchR3cclLIRyyH0bu2A+IM2el86NwS1G2IYo2uZINVLB3UfLbR/J1hs09bflm5+UAsLuhTx/eTdBDo+ExqvM9L6GrMstA1ZjnuhoX0QjkPm1hzYjZFtad6W1xhlubRViavlZmYgsz0e6tE61mpHYoEIZMWb16IXLQgvPqWDxRUexYpbMlLDn7LjWnXmLS9qbApjUQ6L3Adbo/pAmpTx56ooJSen2M4pBkZxrVufGhMdQHLCCRqZCjNT7PAZXGBrgtN5Qa2t4bku+y6DDPLazEjadzan96PMio02srrsRLsOc1H33VdGq7fmd1IjblscEdO6cEFh/18NzzEu3iQ8rQVu9yrrejgYaseiwgZeDcDD8OuBtyoKtOekvQm746M7W+zDeBTfJKic8V871UYh2d6bXSEq50uowjfpBgaSHV7RlsP11Y2hImL5yrqgDImJgH8iYVGLR7FKh5s5wVvSUY0IqVvnZUqH5Kyw+Bdbu9jTW5SR50CO29z8LW4I66jrLWR2j9AipsD3NhNmRCoXtJb0Fu1WImQ6KVHWDy+MmDxShL5fEBF4p1jr1YdvBKUhgb36ZxKfsygZ2BJnKOXZq1dZ56s9Yo5jiKbNACVOm97O7ERqBNnprfyamfLZ9kSPwq6lIOPJXZfICiznHYKTQ9305RYGKK475OJtDTVrDMsLacl1H2+pfmRcvlsANLgdTsOifw0kvhlPqTaZvQ7twXp0yq8FxS5tzLyBEmEjVTX7hqJYZtgUtKHqC7BMj2herUEP0YFfEc00DZ9LyXTiUDM00+Zcv0sj/N3F17FnsoOMjodrwnzpla5k8tX6/T0voEyUCL2Jq84YZRW16jptOJw3S/L1UZN91VgXtuOGUGxTzQcEsFnI8ZqK2iL71x5lg2yFqbAzImZPdhy3B0U+WCTDUZIE9tbh+WqJNoxwRcFQFAxnJwhPHsYVu3Fg0+Vo6c0hJm4YqV3uvGtvpUc7KPOcGHs2zV9XmmyAGTmlENh9tRSAtBQ2vLFpV3J1u8EMwWzTOyxQoMMg+8eT/vGimtuS1DrWOuJsFON/3Zgp/2QRTP5u1/F+T572kWTt/yz9EXkszkKhrso3gmN+1lLuWvvgRFkI3l1Ke39zpK/bdhPGSHF2ZU2dmiTzW+Uoa2VpRzB52G1KR8mt4lXHfVfPQ1wVNfcPlYkvm92UKvhhr0qXdCUoa2XJBzvS1hLFUI5Wb4yqXZTXrY1izCvbxhpPf54tRu5k2j/FJQvGGRc2bY5FgOhq0iVEgzHodUZaDzEP4TWsqL+X3OkYYd0eAcoTseJwX18cK+IrME9ez9hEOoO6lyLmpqM8LV4uwOAqt+sjf8DUZNVnt8IWbg3Ax/brElRcFWxz0Vp6rf/DK36lRs9NEcoepUilM1Oc9GsWr81yA++mi9F/xYAKyh4bPYf3MDjzHRB3ZNxalAxxqcB3I3+RvyEJQScL6CU/tA75vB0GMd9cjXok812tw7amdp5W30NzJssmP0bkkYHfceCW73QRx7pPcxSp49kSuHfVsESRhkoR+K7HlfsPvtMUuPSXidxuUUOT2eqbP/MrigIzxX+ws5cUSXX7XSg0swZg3v2yLtGkzO0RZhSrbrmrCxYCau2jIaW3UWxleTP/jOhs2LPk8PGcG55+uGkb7nh03lKQ8QWaPaEYiS42qcuXynthrLe7b0gYSk1B2AmJczTDbO4CFmmwOeYgrZbsp83AuqrIRjvMnfxsFj+6UOH1EzR3nsW8IsJFn8XMJShIoskVuy/0yy+uKPqVhZk21tLtcvNAFKxXnMsKrsubnsdpcRUgo2LZoa+uJRqkEniLKPTfEfdeFxMRlEZwjZ4UmMxgAxCxErjypnJ9NyX1HkZeMHW8FWB6qWMqWGBZOoWvjfopCpbFX6n8ylP900Jf+5J1JAd4ORcAK0NTNK/pUEzDXCDic0CAB7rmaHErplC2xRchvlu2FqL99s+BKhfBXl3SHKXWSvyz7Yi+zngMZseMZEZjWyyoLJ08hiS90FDPHbNHtMy/Vm0j7HsZzwtu8xvMMjfZXn6S5iIyBsT9uIenJbPyXhii90kPiU7SK3jRp5W45RdChHpVz0XK7/oHUAI9o8spCJqgTPZR5Lgu+TNyQmBVnxmB2l2QjyXWlm9I1D2bScwr4WQkERxKWtoVNSlBT67iRKdtEhiE1sK5XATQ0cBpIy1jSh5rwhB5LQHYhJDsPabppQBqtrbC42ApjsMMYuRBqkdMFCKm3CHL+ecced3ACCPwjUy8Eg2AVrPIDBj3vhEZTVcD6mxiZDkhVs5Js/z5iULg4F4hDRhWFRZN1G/vBFen8MinIZ1v4E2NMCoWDowKOiCC9txMgG9sDDAyDJpJeHO4xzG7HD0d6cYIfJZFjz06JOC4lhgRI8PgaIRVdDaBVSxwr1i0Io1hdbtKCRtfpiFhOjF4ZmQLFx6jZHSxkFt6c1h5u4n2gaN8no5GZyMUaO7cwLRt7yPr9DMbvgVvjpy4KRivXH0YTRqp7XAoAovTE1EZqb+cGI36YUhtg+ZrQlelJrUY3tCReimhxOYhVqN3F3zti9MXZ6c/Sck/MJzspafA8UEniwD9mXxQlneGglmWh7Ebg4zGFdsLIvxqhebvjD5OOHj4mwKEUgMKEGDkeggKaO5eEGSDhijBnky8AhxLmt+D3AD5LJsOYnQJ3sK4rhAnEclZ+wuc6ysL/p4mdZkO2JZllQDoufZWUP4E44yA/pPGFMdtOXiS4YYyLbNnKGg5r0w5goh2FtTzx7GmGGR83xOnueFt4wzieCHCaTk0Cd6NFtQgbo3g34wbsiDnILF+iCNJeBOIBzG4kjkQ+cEQcIZGDzkyKuc48AOe97w9vp7Q50vifcG+iyWPzOQHa1NyGiKYXhzPn8DQ7EeQoo09ieEGSaHE4HY+YzXjiagieMndbuE2R7qjNeSA6L3302J4M8tm7nWawSaHdCo4MyA6DzKgni5yLa1YW6oT/seFcalQltmj4KizdqiksyJmPMP7mVcRVdw96mIT7NAknujSxTfHF2pnsR9EIL3L6NwOqgDgPQAo+nTeNiVIk5EdO4i3fIV/cdH44Zzd98atCoDEyLGnVIrWAjBjGZ7WBVcEs2HYJCPsqAB7rr2Srg27z4wy6Y7wlPV3VZLOygizukU+fKskbjS8Y94HjebRqSGPC0K5msnO3yKq6Aih5ae0uKimazjCm3x9W3D1pveHWpU5UBIIkQbRZ9BqLN+qmD6HV6eG4/IqzRo9mdNKixgCpzA9tRuf7Ohla7OsXpqC46QUBUZL8US2ImQlZEMAKdlbFuWLGvuchDlLRCVmQxvtpnSBZEMAJWlQ0glV6I2pMy9Ul6DG1P0jTo0uvSLpLty40IJii9nrGghhGxY6X5VA/MSH2n1EGKmnqIBp9PLSpjEmuvUC06gxoc4ejYggyKnubQpoNIHaMSoNGEv+wgwSMNAgSq5bLFkLJJGxvTau2kkBFmV910cnfqlVBGsZ+Av7W0/II9rhvWJSOtrRm6fKwVMhoJaelQFnPoODs8aicJfADkgt09kMqbBqRCpMWgyCSRwQHHeOgAcc3oGBz91BTvhXR2OnxQpFNTgRxIpsdgaJ6PwFiYvSPlAzXMP1JgXZ48DQOBekQqxDyPAz/eF6dw45Boxa06pNbqGKhu1Ni461kKwcPwYWrV7Sxm7BSmXINGamoVk9Zd3dqGejAZdQXyYfKhg5DXEky3Wnp6Gb4G0diAtQXMXWnKYYNiB5+WzMgmqVOZbLWoU30cOj66wmjeAlDnzS4F8DWP5lQgDgLflJgGAHUjUMiIOyUvoyF/MQ8eDPxNu9YJ8FW72odmi9UxIuA79q5x7TEOytd29EEwPLHWzlON6iDs7Ax9h59Vj6AOyod9DB3XT6dhjqXj6f4dl46jFTK+kY/13fweFQUrNgK9kD/FOEjfs4GHAX0gqTEOPZFUBqE+lOgYAuhRpEAJpjJoCEwmEHuwh7BtMn9O/R/b9MlPxJDOtwXMLDflsK5brATAd2NjdhxdAuEPm2CO0SWQW8cnWwJV9yqG9Q/w3AZetcgPbvqtfOR3MgIN4C5o8CCoMef1QTA9AYFu39VHIEIH6qNLwyggzz4EItXFk6+et3Ht0a7DbxkgtrXXDL06r71fGKH3ahRweMWDXcjbXMkrk3R95tyx6AEu4QfM9nU88ub6t8m72Gx35WgHVcLFpiyyI4fiGMTsPjivM26Dw4Ge2Lc1q5TV9hDs6GXqH7fr1dd9nOSX66eiOLzabHJGOj/bR7sszdOH4myX7jdBmG5evnjxp835+WbPaWx2klVRL6ubloo0K+dAJZfe44bkbZTlxZugCD4HNF7sdbjXiumX3cgVQd0edp+ti66+P6hr0t/FG3Y5PK12+62/FagIvS37S9d9rOsEsoEoiZLIdhfEQaZ+9lepSd8fXKfxcZ/g+SpYceo3d81nrUWiQrI9LYryq0d2uSbSEpLtaV1lJFD6yVLsKVAgZSkNdCzTEdMd+KmOeyWOwFtcExX2GiQj4acslklJGfb0hI83iNSEZDfpqdjC3rtQw6MgXtWxjaZkivFTtddNtw2Lm566XT9CGaDbKInvug1961IkhL0Wxql81yU131GXpNdUQ9WIvb1yVx24Gm7SD8/qsNZpLhPD4Zn+ptPhqW6UXqfhs06Jp84DPukLYCq1JmMxMOQ7g6H4g/Y5FviDq2EjWz80FgcVe3xspqLjr011o8SvClVK0MOtLkp3QfGkU+Kp35FsgeTqXHAolMFTWgssI/XQ1UHtQy2tDTDH6g467W2cRg17+ddJU8ejkLwYoctvd4bKXnoB7A4Bc3VstMVaKiDUPHsZih8NgCg6rvYA3nCeZsaCPxwMwIC7/P1Iqv6IiUbJicq7KPmNf61MpNOmulHi36dTKfFUN0qfPrzTCbHERaHQDwJ7os8ReYOxQmvoC6o2dTGS8TNH9Jwb3OYEN3troqJLpk1djGQAb5ShYtJ9V9xlZkEDPWRRq2onLlABh0MctbouZ6TIgDbgZaah2IC23pB8l0UH/djXXLJni/oxApC9KHXxY8wan6x+yuFm1OoakCq4G7c7YP+ERevGqZzEwvbOy8YWeoNrKWc3GQ+XCq0BG7Q+Nky/zGpTXe0FfKml5jnyB1xuienfT38sdcTbcbrBZ8RSY9DaJiAI3wtSsWD4lJCZph9lVL64gXDXbxlTVYanYCmzF933WQipq5y7RBj7m+FFD+VBcHaf74WKBuD0m/19q8vJrAUkNx6PABmwTTJSmNmy4NsjrUBv+kbr1RboTR/feoGFerdjtpZCieUohOzVM1gdDH5LNrpgrI4KQagFPc0wfZnDjiqAfy13USL1I8meEnST3PDHNLQGe7+rE6qS3WjhhydqphtdwMo1qW6Uro7FU5pBD3X03NPa/0yr4zf53fFzHOVPKpdSxqI0u3Hi8mKqq3gyPS01VtsoRF4JlGGbNdZrtXENUdUB6FWVkDGuQs4ETe4kMBSTkNODBRjhauMi5qd9EMXgE1U5x2Utmee/p5m2jK9T7Sn9HH0hib5mEZIdHlcF+ygGFkBi+rcxxVx9CYogQ17vaJn2dF9HqUyLJSxKc/0cljTBwfppsNvxSF0D0mT3AxE/NuE0jkBaJ2AfS4i+D/4MdY2TNPTwT8pwnPRpNf0ZqpI19ULC9XnjjFDydM5ax/LrByTHk9WqBiSnHmepfhxCTsF0bOtAikPFXRHqIW20JjawVQV1bIVkeyFVlfTFkJThTO/XID7CBKucxQCgcqceKn4eNNNd+Eg9bHhZcVXwTaK9mFgVXehCssuJwxvyEBzjQj1vaJId+BLjx0ucmQLLG+gJnzGQyBk+b9DB3TvqTk7rbqO/qcMH5DtSvyVhdNwbyKsFHOlv90EcG8gr+Y7UP0bJs4G4nO0mxW0RJGGQhQh5sITbpcfrYPfbY5Yek7CknB6BSw+9hNujWHMLcAm3Fug4YLTFvNPa3s64jazCTfjYR/KAyP02kkhd096PVYE2gE2G216SVdO3FUqWg1Lz+NCSFkMho7v4Gr7H9Q3xDyQk5TwKkGtzJga5FsBELdK0XqU0fzcBTKrgIVJUEzYKNEYJ631eBTJRo4nwIutVOVRfopBGEtk+5wXZn9ECZ9v/iK/jiB66NwVugyR6IHnB8HC5fvni/OV6dRVHQc5jylRxUl6pn9qwCpxy/iMNnELC/Uat7h5+hVLJ81AKhCLYhvoUzhhr5OKv5FkVdQ2q9ksnKg0d4RcbldCFgk2IBg/aHtHRZ3bnZ1KCg9rhu6AoSFYO6Q39ikrZofXql2McB59phJ2HIM71EPF4uAPeSvIlyHZPQfYP++DrPzqTE0Ib+CDHX3t2UGJfa+kgJD7z9MJY9cjTBy0p9IKHvgomkVOjU3YR0f1CD2kq+DNSEK2fnbKBwT++K9ssylYfHgkDoH0m6SYJydfL9X+yKq9WN/9+z2v9sGIPjF6tXqz+67sCdCuAHsLDDvRw4I5uoNf1RgR3GwvEBxjbeCCLAoS0B3KiZQ0N4EOKVtCAT0q6oVHXGxEabZgOH9BoQ3X4osZvVn1QOymkAddgdlBDboS6sdZUHHOSleNn2JpuhJAVNHQbZC0DPPiEnSjMoSa6JaLWH1EwYmQEtzVGW3PYOkPvo0XjvJZDw86yHyL3ITKfQt79ZD1Mzm3ACx8mvQ164WEl0gS+cOfMCVa9IdUXTuNDqe8Cwnrc+prgvqZ3ApPbBo0Ycdw64i3YDaJFYIXuEQWJjDi8SKwGL5txPDxD/xWNOQiDd7at9m9DkddXa/HwBXY4m0B77/TFss2BDKv1TS2U9GAG9jLuK98JZOvXWng7K1fDInhj0OOZ+Unts9HIAvYoRj2j7cAsVP8W7RXgcuzOg0TAFzvejjD14Afez6SNEQOcoTpkblVIjAxZWDncUPMNTrhobABnKAxZzuNqPSIU/C/ltZACIxD2tUPQowb4NzWov70luIyetxbIUuqPCSvNYX/MDZHmBW8/nn3HcYLxq7zpfV1y+9/1Nu70vqjJrvT99XkJ62Qn9bN8cdDWHjTvSu72nIvPkV8rB/mqOxg5zDXd0sa11UdUUQCmFmLktYYttOd6sSL51c+5n7XGou6qbgdC+KFuN/oATPiGnezv7mdBVfu8+6AmuL17eaggOL5/K0coOi3N393D3pn5vY93hQ/7kNurV9+dslj3W7Tui9sUw57jDivsvs9mpMojr7UF7/MB28i5JmZolCxarqqNhZrex2moY7gdZqY4QJvt0fDCrAPoIG4nZtQnvFvKQtURhSy5mftYe8hu5uNNzYDjtp1IEG/tboE0FUcUh+AA7kMYgg+47RYY4El0/XbTSaEqppg2qzzRW9yRgabmoPYBv/L+MyjoRj6QnOI2PpCa7Cc+gBjoFT7sCFv30PahKLDvty/Kouf3t7K/c9pDAe7T9psoxF/abhfVVB55GyW4YA/QF+5/7QMis23t/GKzddjGidkvIq7yPN1FrPOCdtL30vfAy9qfknBFF5XVs9uKA+r/zD8Gt7otJ9boEEe7sqnL9bkWpOB98obEpCAr/jzmcn0d5Lsg1Dteshua2mYvydX2eaLMwx800swBj+I6iK/TJC+yINI92++yKNlFhyAW+6sUAtUT+zbdxaYhqea8IQeSUE1T+zesvYasMrJd/b/YCKCwwwrl+x554N9TbiNjh21SIT54xmgYcpMr8mXNHlhCwr65tjs1poCzhFaWmgwh2X2DOLKWJRbabkz84G1OgB3hQcc98Iy2FR/LFMXGEyaBjvhAUmWhSR8FOMjX1WyfEjsBx/x5Kpcmp8UNMzv4G9ZBYhwfUJo50vJGA5arsA2fP+oHM2sT1dn6DIhb7EQ3P7imnO76wGlRMx7+jhUUqbg9V0XK8/4fTInmL4v1eOw7+kTZ2fpEyGsmy8UutECbNfJMOOUSy2nSmx8ri57mpsbK1BPbicxoaV7cG57MCzITC0lykzKmwQ99i67yMJaNMX/+z9WBwA1H8Afr+rQ5EZaq16v3gLeAo/hGhE79cFpDcZ0+GpCshekBOPiH0FyanAA39WPD5c5XzTNMsf028eTnK8NXjhY2XzVYAR6dy/LSZPUNYwX5xpztk/vxsIK3N/F8tFi4zDcfTQka1/lodtywV7v30JPsVnQ8VxRalTIZcHQOhNRRQIN9Gk0XIfppL0fYeGlxUtQseu07PWSmXvfaA2bWVW/9iH7ZcNFPaZrEbwIs9id6i8DKYndIc2Bl0hM9F6ws40SPfnQgX6RhuVI/0SDyoWeevKHRurR4g8PcQBrnBRRELFMUHk+QBfbi7Oxck1lLg/vRiESqlFHErncHGX7s44AOYsc+CQm4BBm+RjilvGtvme8CH1vgpq9ZTnaQxp77L/dopHXcUBmoUk/+WMT0VcBZD0W4+0LzsbiKAe3Dbhpsqu/P1QEX1O+erVq3CHW2b4rwj8VdrsPPNLIC97BQS+WAeUGablYReNNNEWPTzYqqq2n2/R29OZ4MNVHmRKSbLje1Gl2eDNGlOd1kq62/RrdKhwizrG7K8uNsrQE5G2pHLGHfnKEpczN2TSDkcdLdZJEBwgfGbkD04Ol6G0AZqEGtmF3rSMfaLKwt+w4i5HHSdmSbd3Ag9SYXa6Qq4NSWYbCkEh1t2g+d9PLQ1K4ZF0Ihi3alxyJ6o1I22GJbwsZo8l0t2A5O37Ib9e0M3Is6F+0EL9DdFl9xaY3wZIg6zbEji0CuzcLIW4KsPVkGx8gwxTTZdq1gutNkYW3YdaQOwKG30ORADVSZ3fSrDZBGvUqHaLMsOylXq2VQzFUeJufq69dqK8KqUZ9/uSvrSiijzMKAr6u07hdnWfYBbJ6gLXshX0elFk9U9xwy+w5dY2ewLV28i3JBT4yDNUXkS7V5ht+uc5od3YaOSbVTaoFhiNFZuqr5swE9Nfu8ySesguFj7PIEQ0eBhUdTsUn32U1+/yRSN/ZYK+61K1h9TexanvchwXDe7Uc0EOqzdVtzZ7HAvsGTw+T/AneJ5y1CORqYY4PQFvCt/aDQPUq7E93jwXrUrmmv2KHumZ+6a7dj6jaFMy1lmLosbDyamp66Kj2yRnqKP8R2Z1MfGnnr045MnT64m/KbYKCPhkfDA8GqboxYrTbRX9f4Ds7QNegoWjubV5ictWvai8sOcHrv4DTgVB8IIr1E3xBKLEsbZMZsldLRTb2ekOqxiyYjg71382Bixu8en8UNvWsL+O6cPhc2if66hk7z+GOiodP8BF0TnraY5njg8ctAuWE3Sqy2njm4s8oTDKCzpkcawK29wC5PMHRWOpBiVaoUX91qXhrg/YIfIyy2Y8qFOjKvY1fuHiZ26ZivqValWnevDl3X3P02eRcbfkpYJZR/FmlWmuPbNCRxzlIvNh+OCQ2Px/96Q/LosSVxUdJM+E6tJVqXuUke0vrKW+GoLqIFtiyCMCiCq6yIHoJdUWbvSJ6z01gW/Zd+xuEzCW+S98ficCzKLpP951hattOrc1P7FxuN54v37Os+uY8ulGxGNKLg++T1MYrDhu+3QLhLhAS9k69CSVJZFjSk5ONzQ+mXNLEkVA1f85TgI9kf4pJY/j7ZBl9IH95K/L0jj8HuuUz/ErHPfWFEugUhD/vFmyh4zIJ9XtFo65d/lhgO91///H9j4jz7qZQBAA==</value>
-  </data>
-  <data name="DefaultSchema" xml:space="preserve">
-    <value>dbo</value>
-  </data>
-</root>
\ No newline at end of file
diff --git a/Portal.CMS.Entities/Migrations/201610091045086_CleanupPageBuilderEntities.Designer.cs b/Portal.CMS.Entities/Migrations/201610091045086_CleanupPageBuilderEntities.Designer.cs
deleted file mode 100644
index 6f07a8c..0000000
--- a/Portal.CMS.Entities/Migrations/201610091045086_CleanupPageBuilderEntities.Designer.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-// <auto-generated />
-namespace Portal.CMS.Entities.Migrations
-{
-    using System.CodeDom.Compiler;
-    using System.Data.Entity.Migrations;
-    using System.Data.Entity.Migrations.Infrastructure;
-    using System.Resources;
-    
-    [GeneratedCode("EntityFramework.Migrations", "6.1.3-40302")]
-    public sealed partial class CleanupPageBuilderEntities : IMigrationMetadata
-    {
-        readonly ResourceManager Resources = new ResourceManager(typeof(CleanupPageBuilderEntities));
-        
-        string IMigrationMetadata.Id
-        {
-            get { return "201610091045086_CleanupPageBuilderEntities"; }
-        }
-        
-        string IMigrationMetadata.Source
-        {
-            get { return null; }
-        }
-        
-        string IMigrationMetadata.Target
-        {
-            get { return Resources.GetString("Target"); }
-        }
-    }
-}
diff --git a/Portal.CMS.Entities/Migrations/201610091045086_CleanupPageBuilderEntities.cs b/Portal.CMS.Entities/Migrations/201610091045086_CleanupPageBuilderEntities.cs
deleted file mode 100644
index e959eb6..0000000
--- a/Portal.CMS.Entities/Migrations/201610091045086_CleanupPageBuilderEntities.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-namespace Portal.CMS.Entities.Migrations
-{
-    using System.Data.Entity.Migrations;
-
-    public partial class CleanupPageBuilderEntities : DbMigration
-    {
-        public override void Up()
-        {
-            DropForeignKey("dbo.PageSections", "PageSectionTypeId", "dbo.PageSectionTypes");
-            DropIndex("dbo.PageSections", new[] { "PageSectionTypeId" });
-            DropColumn("dbo.PageComponentTypes", "PageComponentTypeDescription");
-            DropColumn("dbo.PageSections", "PageSectionTypeId");
-        }
-
-        public override void Down()
-        {
-            AddColumn("dbo.PageSections", "PageSectionTypeId", c => c.Int(nullable: false));
-            AddColumn("dbo.PageComponentTypes", "PageComponentTypeDescription", c => c.String(nullable: false));
-            CreateIndex("dbo.PageSections", "PageSectionTypeId");
-            AddForeignKey("dbo.PageSections", "PageSectionTypeId", "dbo.PageSectionTypes", "PageSectionTypeId", cascadeDelete: true);
-        }
-    }
-}
\ No newline at end of file
diff --git a/Portal.CMS.Entities/Migrations/201610091045086_CleanupPageBuilderEntities.resx b/Portal.CMS.Entities/Migrations/201610091045086_CleanupPageBuilderEntities.resx
deleted file mode 100644
index 7f1723b..0000000
--- a/Portal.CMS.Entities/Migrations/201610091045086_CleanupPageBuilderEntities.resx
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <data name="Target" xml:space="preserve">
-    <value>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</value>
-  </data>
-  <data name="DefaultSchema" xml:space="preserve">
-    <value>dbo</value>
-  </data>
-</root>
\ No newline at end of file
diff --git a/Portal.CMS.Entities/Migrations/201703081019598_AddPageSectionBackupEntity.Designer.cs b/Portal.CMS.Entities/Migrations/201703081019598_AddPageSectionBackupEntity.Designer.cs
deleted file mode 100644
index bfce359..0000000
--- a/Portal.CMS.Entities/Migrations/201703081019598_AddPageSectionBackupEntity.Designer.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-// <auto-generated />
-namespace Portal.CMS.Entities.Migrations
-{
-    using System.CodeDom.Compiler;
-    using System.Data.Entity.Migrations;
-    using System.Data.Entity.Migrations.Infrastructure;
-    using System.Resources;
-    
-    [GeneratedCode("EntityFramework.Migrations", "6.1.3-40302")]
-    public sealed partial class AddPageSectionBackupEntity : IMigrationMetadata
-    {
-        private readonly ResourceManager Resources = new ResourceManager(typeof(AddPageSectionBackupEntity));
-        
-        string IMigrationMetadata.Id
-        {
-            get { return "201703081019598_AddPageSectionBackupEntity"; }
-        }
-        
-        string IMigrationMetadata.Source
-        {
-            get { return null; }
-        }
-        
-        string IMigrationMetadata.Target
-        {
-            get { return Resources.GetString("Target"); }
-        }
-    }
-}
diff --git a/Portal.CMS.Entities/Migrations/201703081019598_AddPageSectionBackupEntity.cs b/Portal.CMS.Entities/Migrations/201703081019598_AddPageSectionBackupEntity.cs
deleted file mode 100644
index a950eb4..0000000
--- a/Portal.CMS.Entities/Migrations/201703081019598_AddPageSectionBackupEntity.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-namespace Portal.CMS.Entities.Migrations
-{
-    using System.Data.Entity.Migrations;
-
-    public partial class AddPageSectionBackupEntity : DbMigration
-    {
-        public override void Up()
-        {
-            CreateTable(
-                "dbo.PageSectionBackups",
-                c => new
-                {
-                    PageSectionBackupId = c.Int(nullable: false, identity: true),
-                    PageSectionId = c.Int(nullable: false),
-                    PageSectionBody = c.String(),
-                    DateAdded = c.DateTime(nullable: false),
-                })
-                .PrimaryKey(t => t.PageSectionBackupId)
-                .ForeignKey("dbo.PageSections", t => t.PageSectionId, cascadeDelete: true)
-                .Index(t => t.PageSectionId);
-        }
-
-        public override void Down()
-        {
-            DropForeignKey("dbo.PageSectionBackups", "PageSectionId", "dbo.PageSections");
-            DropIndex("dbo.PageSectionBackups", new[] { "PageSectionId" });
-            DropTable("dbo.PageSectionBackups");
-        }
-    }
-}
\ No newline at end of file
diff --git a/Portal.CMS.Entities/Migrations/201703081019598_AddPageSectionBackupEntity.resx b/Portal.CMS.Entities/Migrations/201703081019598_AddPageSectionBackupEntity.resx
deleted file mode 100644
index a9206a3..0000000
--- a/Portal.CMS.Entities/Migrations/201703081019598_AddPageSectionBackupEntity.resx
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <data name="Target" xml:space="preserve">
-    <value>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</value>
-  </data>
-  <data name="DefaultSchema" xml:space="preserve">
-    <value>dbo</value>
-  </data>
-</root>
\ No newline at end of file
diff --git a/Portal.CMS.Entities/Migrations/201703101042490_AddPageAssociationEntity.Designer.cs b/Portal.CMS.Entities/Migrations/201703101042490_AddPageAssociationEntity.Designer.cs
deleted file mode 100644
index e961417..0000000
--- a/Portal.CMS.Entities/Migrations/201703101042490_AddPageAssociationEntity.Designer.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-// <auto-generated />
-namespace Portal.CMS.Entities.Migrations
-{
-    using System.CodeDom.Compiler;
-    using System.Data.Entity.Migrations;
-    using System.Data.Entity.Migrations.Infrastructure;
-    using System.Resources;
-    
-    [GeneratedCode("EntityFramework.Migrations", "6.1.3-40302")]
-    public sealed partial class AddPageAssociationEntity : IMigrationMetadata
-    {
-        private readonly ResourceManager Resources = new ResourceManager(typeof(AddPageAssociationEntity));
-        
-        string IMigrationMetadata.Id
-        {
-            get { return "201703101042490_AddPageAssociationEntity"; }
-        }
-        
-        string IMigrationMetadata.Source
-        {
-            get { return null; }
-        }
-        
-        string IMigrationMetadata.Target
-        {
-            get { return Resources.GetString("Target"); }
-        }
-    }
-}
diff --git a/Portal.CMS.Entities/Migrations/201703101042490_AddPageAssociationEntity.cs b/Portal.CMS.Entities/Migrations/201703101042490_AddPageAssociationEntity.cs
deleted file mode 100644
index 63ca29c..0000000
--- a/Portal.CMS.Entities/Migrations/201703101042490_AddPageAssociationEntity.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-namespace Portal.CMS.Entities.Migrations
-{
-    using System.Data.Entity.Migrations;
-
-    public partial class AddPageAssociationEntity : DbMigration
-    {
-        public override void Up()
-        {
-            CreateTable(
-                "dbo.PageAssociations",
-                c => new
-                {
-                    PageAssociationId = c.Int(nullable: false, identity: true),
-                    PageId = c.Int(nullable: false),
-                    PageSectionId = c.Int(),
-                    PagePartialId = c.Int(),
-                    PageAssociationOrder = c.Int(nullable: false),
-                })
-                .PrimaryKey(t => t.PageAssociationId)
-                .ForeignKey("dbo.Pages", t => t.PageId, cascadeDelete: true)
-                .ForeignKey("dbo.PagePartials", t => t.PagePartialId)
-                .ForeignKey("dbo.PageSections", t => t.PageSectionId)
-                .Index(t => t.PageId)
-                .Index(t => t.PageSectionId)
-                .Index(t => t.PagePartialId);
-
-            CreateTable(
-                "dbo.PagePartials",
-                c => new
-                {
-                    PagePartialId = c.Int(nullable: false, identity: true),
-                    RouteArea = c.String(),
-                    RouteController = c.String(nullable: false),
-                    RouteAction = c.String(nullable: false),
-                })
-                .PrimaryKey(t => t.PagePartialId);
-        }
-
-        public override void Down()
-        {
-            DropForeignKey("dbo.PageAssociations", "PageSectionId", "dbo.PageSections");
-            DropForeignKey("dbo.PageAssociations", "PagePartialId", "dbo.PagePartials");
-            DropForeignKey("dbo.PageAssociations", "PageId", "dbo.Pages");
-            DropIndex("dbo.PageAssociations", new[] { "PagePartialId" });
-            DropIndex("dbo.PageAssociations", new[] { "PageSectionId" });
-            DropIndex("dbo.PageAssociations", new[] { "PageId" });
-            DropTable("dbo.PagePartials");
-            DropTable("dbo.PageAssociations");
-        }
-    }
-}
\ No newline at end of file
diff --git a/Portal.CMS.Entities/Migrations/201703101042490_AddPageAssociationEntity.resx b/Portal.CMS.Entities/Migrations/201703101042490_AddPageAssociationEntity.resx
deleted file mode 100644
index 80837b0..0000000
--- a/Portal.CMS.Entities/Migrations/201703101042490_AddPageAssociationEntity.resx
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <data name="Target" xml:space="preserve">
-    <value>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</value>
-  </data>
-  <data name="DefaultSchema" xml:space="preserve">
-    <value>dbo</value>
-  </data>
-</root>
\ No newline at end of file
diff --git a/Portal.CMS.Entities/Migrations/201703101043101_SeedPageAssociationEntity.Designer.cs b/Portal.CMS.Entities/Migrations/201703101043101_SeedPageAssociationEntity.Designer.cs
deleted file mode 100644
index d0dae43..0000000
--- a/Portal.CMS.Entities/Migrations/201703101043101_SeedPageAssociationEntity.Designer.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-// <auto-generated />
-namespace Portal.CMS.Entities.Migrations
-{
-    using System.CodeDom.Compiler;
-    using System.Data.Entity.Migrations;
-    using System.Data.Entity.Migrations.Infrastructure;
-    using System.Resources;
-    
-    [GeneratedCode("EntityFramework.Migrations", "6.1.3-40302")]
-    public sealed partial class SeedPageAssociationEntity : IMigrationMetadata
-    {
-        private readonly ResourceManager Resources = new ResourceManager(typeof(SeedPageAssociationEntity));
-        
-        string IMigrationMetadata.Id
-        {
-            get { return "201703101043101_SeedPageAssociationEntity"; }
-        }
-        
-        string IMigrationMetadata.Source
-        {
-            get { return null; }
-        }
-        
-        string IMigrationMetadata.Target
-        {
-            get { return Resources.GetString("Target"); }
-        }
-    }
-}
diff --git a/Portal.CMS.Entities/Migrations/201703101043101_SeedPageAssociationEntity.cs b/Portal.CMS.Entities/Migrations/201703101043101_SeedPageAssociationEntity.cs
deleted file mode 100644
index d07d1a3..0000000
--- a/Portal.CMS.Entities/Migrations/201703101043101_SeedPageAssociationEntity.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-namespace Portal.CMS.Entities.Migrations
-{
-    using System.Data.Entity.Migrations;
-
-    public partial class SeedPageAssociationEntity : DbMigration
-    {
-        private readonly PortalEntityModel _context = new PortalEntityModel();
-
-        public override void Up()
-        {
-            // TRANSITION: Section Detail over to new Page Association Entity
-            _context.Database.ExecuteSqlCommand("INSERT INTO PageAssociations (PageId, PageSectionId, PageAssociationOrder) SELECT PageId, PageSectionId, PageSectionOrder FROM PageSections");
-        }
-
-        public override void Down()
-        {
-        }
-    }
-}
\ No newline at end of file
diff --git a/Portal.CMS.Entities/Migrations/201703101043101_SeedPageAssociationEntity.resx b/Portal.CMS.Entities/Migrations/201703101043101_SeedPageAssociationEntity.resx
deleted file mode 100644
index 80837b0..0000000
--- a/Portal.CMS.Entities/Migrations/201703101043101_SeedPageAssociationEntity.resx
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <data name="Target" xml:space="preserve">
-    <value>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</value>
-  </data>
-  <data name="DefaultSchema" xml:space="preserve">
-    <value>dbo</value>
-  </data>
-</root>
\ No newline at end of file
diff --git a/Portal.CMS.Entities/Migrations/201703101150152_UpdatePageSectionEntityToRemoveLegacyProperties.Designer.cs b/Portal.CMS.Entities/Migrations/201703101150152_UpdatePageSectionEntityToRemoveLegacyProperties.Designer.cs
deleted file mode 100644
index 0e44c8e..0000000
--- a/Portal.CMS.Entities/Migrations/201703101150152_UpdatePageSectionEntityToRemoveLegacyProperties.Designer.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-// <auto-generated />
-namespace Portal.CMS.Entities.Migrations
-{
-    using System.CodeDom.Compiler;
-    using System.Data.Entity.Migrations;
-    using System.Data.Entity.Migrations.Infrastructure;
-    using System.Resources;
-    
-    [GeneratedCode("EntityFramework.Migrations", "6.1.3-40302")]
-    public sealed partial class UpdatePageSectionEntityToRemoveLegacyProperties : IMigrationMetadata
-    {
-        private readonly ResourceManager Resources = new ResourceManager(typeof(UpdatePageSectionEntityToRemoveLegacyProperties));
-        
-        string IMigrationMetadata.Id
-        {
-            get { return "201703101150152_UpdatePageSectionEntityToRemoveLegacyProperties"; }
-        }
-        
-        string IMigrationMetadata.Source
-        {
-            get { return null; }
-        }
-        
-        string IMigrationMetadata.Target
-        {
-            get { return Resources.GetString("Target"); }
-        }
-    }
-}
diff --git a/Portal.CMS.Entities/Migrations/201703101150152_UpdatePageSectionEntityToRemoveLegacyProperties.cs b/Portal.CMS.Entities/Migrations/201703101150152_UpdatePageSectionEntityToRemoveLegacyProperties.cs
deleted file mode 100644
index 86e4d1d..0000000
--- a/Portal.CMS.Entities/Migrations/201703101150152_UpdatePageSectionEntityToRemoveLegacyProperties.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-namespace Portal.CMS.Entities.Migrations
-{
-    using System.Data.Entity.Migrations;
-
-    public partial class UpdatePageSectionEntityToRemoveLegacyProperties : DbMigration
-    {
-        public override void Up()
-        {
-            DropForeignKey("dbo.PageSections", "PageId", "dbo.Pages");
-            DropIndex("dbo.PageSections", new[] { "PageId" });
-            DropColumn("dbo.PageSections", "PageId");
-            DropColumn("dbo.PageSections", "PageSectionOrder");
-        }
-
-        public override void Down()
-        {
-            AddColumn("dbo.PageSections", "PageSectionOrder", c => c.Int(nullable: false));
-            AddColumn("dbo.PageSections", "PageId", c => c.Int(nullable: false));
-            CreateIndex("dbo.PageSections", "PageId");
-            AddForeignKey("dbo.PageSections", "PageId", "dbo.Pages", "PageId", cascadeDelete: true);
-        }
-    }
-}
\ No newline at end of file
diff --git a/Portal.CMS.Entities/Migrations/201703101150152_UpdatePageSectionEntityToRemoveLegacyProperties.resx b/Portal.CMS.Entities/Migrations/201703101150152_UpdatePageSectionEntityToRemoveLegacyProperties.resx
deleted file mode 100644
index 4ab44c2..0000000
--- a/Portal.CMS.Entities/Migrations/201703101150152_UpdatePageSectionEntityToRemoveLegacyProperties.resx
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <data name="Target" xml:space="preserve">
-    <value>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</value>
-  </data>
-  <data name="DefaultSchema" xml:space="preserve">
-    <value>dbo</value>
-  </data>
-</root>
\ No newline at end of file
diff --git a/Portal.CMS.Entities/Migrations/201703111606414_ConvertSectionRolesIntoAssociationRoles.Designer.cs b/Portal.CMS.Entities/Migrations/201703111606414_ConvertSectionRolesIntoAssociationRoles.Designer.cs
deleted file mode 100644
index 48872f4..0000000
--- a/Portal.CMS.Entities/Migrations/201703111606414_ConvertSectionRolesIntoAssociationRoles.Designer.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-// <auto-generated />
-namespace Portal.CMS.Entities.Migrations
-{
-    using System.CodeDom.Compiler;
-    using System.Data.Entity.Migrations;
-    using System.Data.Entity.Migrations.Infrastructure;
-    using System.Resources;
-    
-    [GeneratedCode("EntityFramework.Migrations", "6.1.3-40302")]
-    public sealed partial class ConvertSectionRolesIntoAssociationRoles : IMigrationMetadata
-    {
-        private readonly ResourceManager Resources = new ResourceManager(typeof(ConvertSectionRolesIntoAssociationRoles));
-        
-        string IMigrationMetadata.Id
-        {
-            get { return "201703111606414_ConvertSectionRolesIntoAssociationRoles"; }
-        }
-        
-        string IMigrationMetadata.Source
-        {
-            get { return null; }
-        }
-        
-        string IMigrationMetadata.Target
-        {
-            get { return Resources.GetString("Target"); }
-        }
-    }
-}
diff --git a/Portal.CMS.Entities/Migrations/201703111606414_ConvertSectionRolesIntoAssociationRoles.cs b/Portal.CMS.Entities/Migrations/201703111606414_ConvertSectionRolesIntoAssociationRoles.cs
deleted file mode 100644
index 6f23d20..0000000
--- a/Portal.CMS.Entities/Migrations/201703111606414_ConvertSectionRolesIntoAssociationRoles.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-namespace Portal.CMS.Entities.Migrations
-{
-    using System.Data.Entity.Migrations;
-
-    public partial class ConvertSectionRolesIntoAssociationRoles : DbMigration
-    {
-        public override void Up()
-        {
-            DropForeignKey("dbo.PageSectionRoles", "PageSectionId", "dbo.PageSections");
-            DropForeignKey("dbo.PageSectionRoles", "RoleId", "dbo.Roles");
-            DropIndex("dbo.PageSectionRoles", new[] { "PageSectionId" });
-            DropIndex("dbo.PageSectionRoles", new[] { "RoleId" });
-            CreateTable(
-                "dbo.PageAssociationRoles",
-                c => new
-                {
-                    PageAssociationRoleId = c.Int(nullable: false, identity: true),
-                    PageAssociationId = c.Int(nullable: false),
-                    RoleId = c.Int(nullable: false),
-                })
-                .PrimaryKey(t => t.PageAssociationRoleId)
-                .ForeignKey("dbo.PageAssociations", t => t.PageAssociationId, cascadeDelete: true)
-                .ForeignKey("dbo.Roles", t => t.RoleId, cascadeDelete: true)
-                .Index(t => t.PageAssociationId)
-                .Index(t => t.RoleId);
-
-            DropTable("dbo.PageSectionRoles");
-        }
-
-        public override void Down()
-        {
-            CreateTable(
-                "dbo.PageSectionRoles",
-                c => new
-                {
-                    PageSectionRoleId = c.Int(nullable: false, identity: true),
-                    PageSectionId = c.Int(nullable: false),
-                    RoleId = c.Int(nullable: false),
-                })
-                .PrimaryKey(t => t.PageSectionRoleId);
-
-            DropForeignKey("dbo.PageAssociationRoles", "RoleId", "dbo.Roles");
-            DropForeignKey("dbo.PageAssociationRoles", "PageAssociationId", "dbo.PageAssociations");
-            DropIndex("dbo.PageAssociationRoles", new[] { "RoleId" });
-            DropIndex("dbo.PageAssociationRoles", new[] { "PageAssociationId" });
-            DropTable("dbo.PageAssociationRoles");
-            CreateIndex("dbo.PageSectionRoles", "RoleId");
-            CreateIndex("dbo.PageSectionRoles", "PageSectionId");
-            AddForeignKey("dbo.PageSectionRoles", "RoleId", "dbo.Roles", "RoleId", cascadeDelete: true);
-            AddForeignKey("dbo.PageSectionRoles", "PageSectionId", "dbo.PageSections", "PageSectionId", cascadeDelete: true);
-        }
-    }
-}
\ No newline at end of file
diff --git a/Portal.CMS.Entities/Migrations/201703111606414_ConvertSectionRolesIntoAssociationRoles.resx b/Portal.CMS.Entities/Migrations/201703111606414_ConvertSectionRolesIntoAssociationRoles.resx
deleted file mode 100644
index 09091b9..0000000
--- a/Portal.CMS.Entities/Migrations/201703111606414_ConvertSectionRolesIntoAssociationRoles.resx
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <data name="Target" xml:space="preserve">
-    <value>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</value>
-  </data>
-  <data name="DefaultSchema" xml:space="preserve">
-    <value>dbo</value>
-  </data>
-</root>
\ No newline at end of file
diff --git a/Portal.CMS.Entities/Migrations/201703242023520_AvoidReservedTypeNames.Designer.cs b/Portal.CMS.Entities/Migrations/201703242023520_AvoidReservedTypeNames.Designer.cs
deleted file mode 100644
index e732bf0..0000000
--- a/Portal.CMS.Entities/Migrations/201703242023520_AvoidReservedTypeNames.Designer.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-// <auto-generated />
-namespace Portal.CMS.Entities.Migrations
-{
-    using System.CodeDom.Compiler;
-    using System.Data.Entity.Migrations;
-    using System.Data.Entity.Migrations.Infrastructure;
-    using System.Resources;
-    
-    [GeneratedCode("EntityFramework.Migrations", "6.1.3-40302")]
-    public sealed partial class AvoidReservedTypeNames : IMigrationMetadata
-    {
-        private readonly ResourceManager Resources = new ResourceManager(typeof(AvoidReservedTypeNames));
-        
-        string IMigrationMetadata.Id
-        {
-            get { return "201703242023520_AvoidReservedTypeNames"; }
-        }
-        
-        string IMigrationMetadata.Source
-        {
-            get { return null; }
-        }
-        
-        string IMigrationMetadata.Target
-        {
-            get { return Resources.GetString("Target"); }
-        }
-    }
-}
diff --git a/Portal.CMS.Entities/Migrations/201703242023520_AvoidReservedTypeNames.cs b/Portal.CMS.Entities/Migrations/201703242023520_AvoidReservedTypeNames.cs
deleted file mode 100644
index e471899..0000000
--- a/Portal.CMS.Entities/Migrations/201703242023520_AvoidReservedTypeNames.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-namespace Portal.CMS.Entities.Migrations
-{
-    using System.Data.Entity.Migrations;
-
-    public partial class AvoidReservedTypeNames : DbMigration
-    {
-        public override void Up()
-        {
-            RenameTable(name: "dbo.Copies", newName: "CopyItems");
-            RenameTable(name: "dbo.Menus", newName: "MenuSystems");
-            RenameTable(name: "dbo.Themes", newName: "CustomThemes");
-        }
-
-        public override void Down()
-        {
-            RenameTable(name: "dbo.CustomThemes", newName: "Themes");
-            RenameTable(name: "dbo.MenuSystems", newName: "Menus");
-            RenameTable(name: "dbo.CopyItems", newName: "Copies");
-        }
-    }
-}
\ No newline at end of file
diff --git a/Portal.CMS.Entities/Migrations/201703242023520_AvoidReservedTypeNames.resx b/Portal.CMS.Entities/Migrations/201703242023520_AvoidReservedTypeNames.resx
deleted file mode 100644
index 5decfc5..0000000
--- a/Portal.CMS.Entities/Migrations/201703242023520_AvoidReservedTypeNames.resx
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <data name="Target" xml:space="preserve">
-    <value>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</value>
-  </data>
-  <data name="DefaultSchema" xml:space="preserve">
-    <value>dbo</value>
-  </data>
-</root>
\ No newline at end of file
diff --git a/Portal.CMS.Entities/Migrations/201703291711230_UpdateBuilderAreaName.Designer.cs b/Portal.CMS.Entities/Migrations/201703291711230_UpdateBuilderAreaName.Designer.cs
deleted file mode 100644
index b134dda..0000000
--- a/Portal.CMS.Entities/Migrations/201703291711230_UpdateBuilderAreaName.Designer.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-// <auto-generated />
-namespace Portal.CMS.Entities.Migrations
-{
-    using System.CodeDom.Compiler;
-    using System.Data.Entity.Migrations;
-    using System.Data.Entity.Migrations.Infrastructure;
-    using System.Resources;
-    
-    [GeneratedCode("EntityFramework.Migrations", "6.1.3-40302")]
-    public sealed partial class UpdateBuilderAreaName : IMigrationMetadata
-    {
-        private readonly ResourceManager Resources = new ResourceManager(typeof(UpdateBuilderAreaName));
-        
-        string IMigrationMetadata.Id
-        {
-            get { return "201703291711230_UpdateBuilderAreaName"; }
-        }
-        
-        string IMigrationMetadata.Source
-        {
-            get { return null; }
-        }
-        
-        string IMigrationMetadata.Target
-        {
-            get { return Resources.GetString("Target"); }
-        }
-    }
-}
diff --git a/Portal.CMS.Entities/Migrations/201703291711230_UpdateBuilderAreaName.cs b/Portal.CMS.Entities/Migrations/201703291711230_UpdateBuilderAreaName.cs
deleted file mode 100644
index d23b192..0000000
--- a/Portal.CMS.Entities/Migrations/201703291711230_UpdateBuilderAreaName.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-namespace Portal.CMS.Entities.Migrations
-{
-    using System.Data.Entity.Migrations;
-
-    public partial class UpdateBuilderAreaName : DbMigration
-    {
-        private readonly PortalEntityModel _context = new PortalEntityModel();
-
-        public override void Up()
-        {
-            foreach (var image in _context.Images)
-                image.ImagePath = image.ImagePath.Replace("Areas/Builder/", "Areas/PageBuilder/");
-
-            foreach (var pageSection in _context.PageSections)
-                pageSection.PageSectionBody = pageSection.PageSectionBody.Replace("Areas/Builder/", "Areas/PageBuilder/");
-
-            foreach (var pageSection in _context.PageSectionBackups)
-                pageSection.PageSectionBody = pageSection.PageSectionBody.Replace("Areas/Builder/", "Areas/PageBuilder/");
-
-            foreach (var post in _context.Posts)
-                post.PostBody = post.PostBody.Replace("Areas/Builder/", "Areas/PageBuilder/");
-
-            _context.SaveChanges();
-        }
-
-        public override void Down()
-        {
-            foreach (var image in _context.Images)
-                image.ImagePath = image.ImagePath.Replace("Areas/PageBuilder/", "Areas/Builder/");
-
-            foreach (var pageSection in _context.PageSections)
-                pageSection.PageSectionBody = pageSection.PageSectionBody.Replace("Areas/PageBuilder/", "Areas/Builder/");
-
-            foreach (var pageSection in _context.PageSectionBackups)
-                pageSection.PageSectionBody = pageSection.PageSectionBody.Replace("Areas/PageBuilder/", "Areas/Builder/");
-
-            foreach (var post in _context.Posts)
-                post.PostBody = post.PostBody.Replace("Areas/PageBuilder/", "Areas/Builder/");
-
-            _context.SaveChanges();
-        }
-    }
-}
\ No newline at end of file
diff --git a/Portal.CMS.Entities/Migrations/201703291711230_UpdateBuilderAreaName.resx b/Portal.CMS.Entities/Migrations/201703291711230_UpdateBuilderAreaName.resx
deleted file mode 100644
index 5decfc5..0000000
--- a/Portal.CMS.Entities/Migrations/201703291711230_UpdateBuilderAreaName.resx
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <data name="Target" xml:space="preserve">
-    <value>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</value>
-  </data>
-  <data name="DefaultSchema" xml:space="preserve">
-    <value>dbo</value>
-  </data>
-</root>
\ No newline at end of file
diff --git a/Portal.CMS.Entities/Migrations/201707211220449_StripWebsiteAddressFromUploadedContent.Designer.cs b/Portal.CMS.Entities/Migrations/201707211220449_StripWebsiteAddressFromUploadedContent.Designer.cs
deleted file mode 100644
index 3cfc969..0000000
--- a/Portal.CMS.Entities/Migrations/201707211220449_StripWebsiteAddressFromUploadedContent.Designer.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-// <auto-generated />
-namespace Portal.CMS.Entities.Migrations
-{
-    using System.CodeDom.Compiler;
-    using System.Data.Entity.Migrations;
-    using System.Data.Entity.Migrations.Infrastructure;
-    using System.Resources;
-    
-    [GeneratedCode("EntityFramework.Migrations", "6.1.3-40302")]
-    public sealed partial class StripWebsiteAddressFromUploadedContent : IMigrationMetadata
-    {
-        private readonly ResourceManager Resources = new ResourceManager(typeof(StripWebsiteAddressFromUploadedContent));
-        
-        string IMigrationMetadata.Id
-        {
-            get { return "201707211220449_StripWebsiteAddressFromUploadedContent"; }
-        }
-        
-        string IMigrationMetadata.Source
-        {
-            get { return null; }
-        }
-        
-        string IMigrationMetadata.Target
-        {
-            get { return Resources.GetString("Target"); }
-        }
-    }
-}
diff --git a/Portal.CMS.Entities/Migrations/201707211220449_StripWebsiteAddressFromUploadedContent.cs b/Portal.CMS.Entities/Migrations/201707211220449_StripWebsiteAddressFromUploadedContent.cs
deleted file mode 100644
index 8355faa..0000000
--- a/Portal.CMS.Entities/Migrations/201707211220449_StripWebsiteAddressFromUploadedContent.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-namespace Portal.CMS.Entities.Migrations
-{
-    using System.Data.Entity.Migrations;
-    using System.Linq;
-
-    public partial class StripWebsiteAddressFromUploadedContent : DbMigration
-    {
-        private readonly PortalEntityModel _context = new PortalEntityModel();
-
-        public override void Up()
-        {
-            var uploadedImages = _context.Images.ToList();
-
-            foreach (var image in uploadedImages)
-            {
-                image.ImagePath = StripWebsiteAddress(image.ImagePath);
-            }
-
-            var uploadedFonts = _context.Fonts.ToList();
-
-            foreach (var font in uploadedFonts)
-            {
-                font.FontPath = StripWebsiteAddress(font.FontPath);
-            }
-
-            _context.SaveChanges();
-        }
-
-        public override void Down()
-        {
-        }
-
-        private string StripWebsiteAddress(string filePath)
-        {
-            var startPosition = filePath.ToLower().IndexOf("/areas");
-
-            if (startPosition < 1)
-            {
-                return filePath;
-            }
-
-            filePath = filePath.Substring(startPosition);
-
-            return filePath;
-        }
-    }
-}
\ No newline at end of file
diff --git a/Portal.CMS.Entities/Migrations/201707211220449_StripWebsiteAddressFromUploadedContent.resx b/Portal.CMS.Entities/Migrations/201707211220449_StripWebsiteAddressFromUploadedContent.resx
deleted file mode 100644
index 5decfc5..0000000
--- a/Portal.CMS.Entities/Migrations/201707211220449_StripWebsiteAddressFromUploadedContent.resx
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <data name="Target" xml:space="preserve">
-    <value>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</value>
-  </data>
-  <data name="DefaultSchema" xml:space="preserve">
-    <value>dbo</value>
-  </data>
-</root>
\ No newline at end of file
diff --git a/Portal.CMS.Entities/Migrations/201708101940509_ExtendRolesEntityWithIsAssignableProperty.Designer.cs b/Portal.CMS.Entities/Migrations/201708101940509_ExtendRolesEntityWithIsAssignableProperty.Designer.cs
deleted file mode 100644
index 4134ccc..0000000
--- a/Portal.CMS.Entities/Migrations/201708101940509_ExtendRolesEntityWithIsAssignableProperty.Designer.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-// <auto-generated />
-namespace Portal.CMS.Entities.Migrations
-{
-    using System.CodeDom.Compiler;
-    using System.Data.Entity.Migrations;
-    using System.Data.Entity.Migrations.Infrastructure;
-    using System.Resources;
-    
-    [GeneratedCode("EntityFramework.Migrations", "6.1.3-40302")]
-    public sealed partial class ExtendRolesEntityWithIsAssignableProperty : IMigrationMetadata
-    {
-        private readonly ResourceManager Resources = new ResourceManager(typeof(ExtendRolesEntityWithIsAssignableProperty));
-        
-        string IMigrationMetadata.Id
-        {
-            get { return "201708101940509_ExtendRolesEntityWithIsAssignableProperty"; }
-        }
-        
-        string IMigrationMetadata.Source
-        {
-            get { return null; }
-        }
-        
-        string IMigrationMetadata.Target
-        {
-            get { return Resources.GetString("Target"); }
-        }
-    }
-}
diff --git a/Portal.CMS.Entities/Migrations/201708101940509_ExtendRolesEntityWithIsAssignableProperty.cs b/Portal.CMS.Entities/Migrations/201708101940509_ExtendRolesEntityWithIsAssignableProperty.cs
deleted file mode 100644
index caa8adf..0000000
--- a/Portal.CMS.Entities/Migrations/201708101940509_ExtendRolesEntityWithIsAssignableProperty.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-namespace Portal.CMS.Entities.Migrations
-{
-    using System.Data.Entity.Migrations;
-
-    public partial class ExtendRolesEntityWithIsAssignableProperty : DbMigration
-    {
-        public override void Up()
-        {
-            AddColumn("dbo.Roles", "IsAssignable", c => c.Boolean(nullable: false));
-        }
-
-        public override void Down()
-        {
-            DropColumn("dbo.Roles", "IsAssignable");
-        }
-    }
-}
\ No newline at end of file
diff --git a/Portal.CMS.Entities/Migrations/201708101940509_ExtendRolesEntityWithIsAssignableProperty.resx b/Portal.CMS.Entities/Migrations/201708101940509_ExtendRolesEntityWithIsAssignableProperty.resx
deleted file mode 100644
index ca181ee..0000000
--- a/Portal.CMS.Entities/Migrations/201708101940509_ExtendRolesEntityWithIsAssignableProperty.resx
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <data name="Target" xml:space="preserve">
-    <value>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</value>
-  </data>
-  <data name="DefaultSchema" xml:space="preserve">
-    <value>dbo</value>
-  </data>
-</root>
\ No newline at end of file
diff --git a/Portal.CMS.Entities/Migrations/201708101946158_UpdateExistingAdminAndEditorRoles.Designer.cs b/Portal.CMS.Entities/Migrations/201708101946158_UpdateExistingAdminAndEditorRoles.Designer.cs
deleted file mode 100644
index 93a0f07..0000000
--- a/Portal.CMS.Entities/Migrations/201708101946158_UpdateExistingAdminAndEditorRoles.Designer.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-// <auto-generated />
-namespace Portal.CMS.Entities.Migrations
-{
-    using System.CodeDom.Compiler;
-    using System.Data.Entity.Migrations;
-    using System.Data.Entity.Migrations.Infrastructure;
-    using System.Resources;
-    
-    [GeneratedCode("EntityFramework.Migrations", "6.1.3-40302")]
-    public sealed partial class UpdateExistingAdminAndEditorRoles : IMigrationMetadata
-    {
-        private readonly ResourceManager Resources = new ResourceManager(typeof(UpdateExistingAdminAndEditorRoles));
-        
-        string IMigrationMetadata.Id
-        {
-            get { return "201708101946158_UpdateExistingAdminAndEditorRoles"; }
-        }
-        
-        string IMigrationMetadata.Source
-        {
-            get { return null; }
-        }
-        
-        string IMigrationMetadata.Target
-        {
-            get { return Resources.GetString("Target"); }
-        }
-    }
-}
diff --git a/Portal.CMS.Entities/Migrations/201708101946158_UpdateExistingAdminAndEditorRoles.cs b/Portal.CMS.Entities/Migrations/201708101946158_UpdateExistingAdminAndEditorRoles.cs
deleted file mode 100644
index f7a2021..0000000
--- a/Portal.CMS.Entities/Migrations/201708101946158_UpdateExistingAdminAndEditorRoles.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-namespace Portal.CMS.Entities.Migrations
-{
-    using System;
-    using System.Data.Entity.Migrations;
-    using System.Linq;
-
-    public partial class UpdateExistingAdminAndEditorRoles : DbMigration
-    {
-        private readonly PortalEntityModel _context = new PortalEntityModel();
-
-        public override void Up()
-        {
-            var roleList = _context.Roles.ToList();
-
-            var adminRole = roleList.FirstOrDefault(x => "Admin".Equals(x.RoleName, StringComparison.OrdinalIgnoreCase));
-            if (adminRole != null) adminRole.IsAssignable = true;
-
-            var editorRole = roleList.FirstOrDefault(x => "Editor".Equals(x.RoleName, StringComparison.OrdinalIgnoreCase));
-            if (editorRole != null) editorRole.IsAssignable = true;
-
-            _context.SaveChanges();
-        }
-
-        public override void Down()
-        {
-        }
-    }
-}
\ No newline at end of file
diff --git a/Portal.CMS.Entities/Migrations/201708101946158_UpdateExistingAdminAndEditorRoles.resx b/Portal.CMS.Entities/Migrations/201708101946158_UpdateExistingAdminAndEditorRoles.resx
deleted file mode 100644
index ca181ee..0000000
--- a/Portal.CMS.Entities/Migrations/201708101946158_UpdateExistingAdminAndEditorRoles.resx
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <data name="Target" xml:space="preserve">
-    <value>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</value>
-  </data>
-  <data name="DefaultSchema" xml:space="preserve">
-    <value>dbo</value>
-  </data>
-</root>
\ No newline at end of file
diff --git a/Portal.CMS.Entities/Migrations/Configuration.cs b/Portal.CMS.Entities/Migrations/Configuration.cs
deleted file mode 100644
index 37cb116..0000000
--- a/Portal.CMS.Entities/Migrations/Configuration.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-namespace Portal.CMS.Entities.Migrations
-{
-    using Seed;
-    using System.Data.Entity.Migrations;
-
-    internal sealed class Configuration : DbMigrationsConfiguration<Portal.CMS.Entities.PortalEntityModel>
-    {
-        public Configuration()
-        {
-            AutomaticMigrationsEnabled = false;
-        }
-
-        protected override void Seed(Portal.CMS.Entities.PortalEntityModel context)
-        {
-            ThemeSeed.Seed(context);
-            RoleSeed.Seed(context);
-            SettingSeed.Seed(context);
-            PostCategorySeed.Seed(context);
-            PageSectionTypeSeed.Seed(context);
-            PageComponentTypeSeed.Seed(context);
-            MediaSeed.Seed(context);
-            CopySeed.Seed(context);
-            context.SaveChanges();
-
-            MenuSeed.Seed(context);
-            PageSeed.Seed(context);
-            PostSeed.Seed(context);
-        }
-    }
-}
\ No newline at end of file
diff --git a/Portal.CMS.Entities/Portal.CMS.Entities.csproj b/Portal.CMS.Entities/Portal.CMS.Entities.csproj
deleted file mode 100644
index f58a8d6..0000000
--- a/Portal.CMS.Entities/Portal.CMS.Entities.csproj
+++ /dev/null
@@ -1,370 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{13103A2E-FF04-442F-95F6-C2E8EDB0F274}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Portal.CMS.Entities</RootNamespace>
-    <AssemblyName>Portal.CMS.Entities</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <TargetFrameworkProfile />
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.dll</HintPath>
-    </Reference>
-    <Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.SqlServer.dll</HintPath>
-    </Reference>
-    <Reference Include="HtmlAgilityPack, Version=1.8.9.0, Culture=neutral, PublicKeyToken=bd319b19eaf3b43a, processorArchitecture=MSIL">
-      <HintPath>..\packages\HtmlAgilityPack.1.8.9\lib\Net45\HtmlAgilityPack.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.ComponentModel.DataAnnotations" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Runtime.Serialization" />
-    <Reference Include="System.Security" />
-    <Reference Include="System.ServiceModel.Activities" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Entities\AnalyticPageView.cs" />
-    <Compile Include="Entities\AnalyticPostView.cs" />
-    <Compile Include="Enumerators\ChartSize.cs" />
-    <Compile Include="Enumerators\ChartType.cs" />
-    <Compile Include="Enumerators\TimePeriod.cs" />
-    <Compile Include="Entities\Role.cs" />
-    <Compile Include="Entities\User.cs" />
-    <Compile Include="Entities\UserRole.cs" />
-    <Compile Include="Entities\UserToken.cs" />
-    <Compile Include="Enumerators\UserTokenType.cs" />
-    <Compile Include="Entities\CopyItem.cs" />
-    <Compile Include="Entities\Image.cs" />
-    <Compile Include="Enumerators\ImageCategory.cs" />
-    <Compile Include="Enumerators\PublicationState.cs" />
-    <Compile Include="Entities\MenuSystem.cs" />
-    <Compile Include="Entities\MenuItem.cs" />
-    <Compile Include="Entities\MenuItemRole.cs" />
-    <Compile Include="Enumerators\Animation.cs" />
-    <Compile Include="Entities\Page.cs" />
-    <Compile Include="Entities\PageComponentType.cs" />
-    <Compile Include="Entities\PageAssociation.cs" />
-    <Compile Include="Entities\PagePartial.cs" />
-    <Compile Include="Entities\PageSectionBackup.cs" />
-    <Compile Include="Enumerators\PageSectionTypeCategory.cs" />
-    <Compile Include="Enumerators\PageComponentTypeCategory.cs" />
-    <Compile Include="Entities\PageSection.cs" />
-    <Compile Include="Enumerators\PageSectionBackgroundStyle.cs" />
-    <Compile Include="Enumerators\PageSectionHeight.cs" />
-    <Compile Include="Entities\PageSectionType.cs" />
-    <Compile Include="Entities\PageRole.cs" />
-    <Compile Include="Entities\PageAssociationRole.cs" />
-    <Compile Include="Entities\Post.cs" />
-    <Compile Include="Entities\PostCategory.cs" />
-    <Compile Include="Entities\PostComment.cs" />
-    <Compile Include="Entities\PostImage.cs" />
-    <Compile Include="Enumerators\PostImageType.cs" />
-    <Compile Include="Entities\PostRole.cs" />
-    <Compile Include="Entities\Setting.cs" />
-    <Compile Include="Entities\Font.cs" />
-    <Compile Include="Entities\CustomTheme.cs" />
-    <Compile Include="Initialisers\DropAndMigrateDatabaseToLatestVersion.cs" />
-    <Compile Include="Initialisers\Environments\DefaultInitialiser.cs" />
-    <Compile Include="Initialisers\MigrateDatabaseToLatestVersion.cs" />
-    <Compile Include="Migrations\201607122131202_InitialPortalCMSSchema.cs" />
-    <Compile Include="Migrations\201607122131202_InitialPortalCMSSchema.Designer.cs">
-      <DependentUpon>201607122131202_InitialPortalCMSSchema.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\201607142300116_AddAnalyticsEntities.cs" />
-    <Compile Include="Migrations\201607142300116_AddAnalyticsEntities.Designer.cs">
-      <DependentUpon>201607142300116_AddAnalyticsEntities.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\201607161849511_AddPageSectionOrderToPageSections.cs" />
-    <Compile Include="Migrations\201607161849511_AddPageSectionOrderToPageSections.Designer.cs">
-      <DependentUpon>201607161849511_AddPageSectionOrderToPageSections.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\201607171344335_ExtendAnalyticStorage.cs" />
-    <Compile Include="Migrations\201607171344335_ExtendAnalyticStorage.Designer.cs">
-      <DependentUpon>201607171344335_ExtendAnalyticStorage.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\201607171347205_RemoveRequirementForReferralAnalytic.cs" />
-    <Compile Include="Migrations\201607171347205_RemoveRequirementForReferralAnalytic.Designer.cs">
-      <DependentUpon>201607171347205_RemoveRequirementForReferralAnalytic.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\201607211935456_AddAvatarPathToUserEntity.cs" />
-    <Compile Include="Migrations\201607211935456_AddAvatarPathToUserEntity.Designer.cs">
-      <DependentUpon>201607211935456_AddAvatarPathToUserEntity.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\201607241651305_ExtendSectionTypeEntity.cs" />
-    <Compile Include="Migrations\201607241651305_ExtendSectionTypeEntity.Designer.cs">
-      <DependentUpon>201607241651305_ExtendSectionTypeEntity.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\201607271844003_AddUserTokenEntity.cs" />
-    <Compile Include="Migrations\201607271844003_AddUserTokenEntity.Designer.cs">
-      <DependentUpon>201607271844003_AddUserTokenEntity.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\201607271854537_ExtendUserTokenEntity.cs" />
-    <Compile Include="Migrations\201607271854537_ExtendUserTokenEntity.Designer.cs">
-      <DependentUpon>201607271854537_ExtendUserTokenEntity.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\201607301215211_AddBioPropertyToUserEntity.cs" />
-    <Compile Include="Migrations\201607301215211_AddBioPropertyToUserEntity.Designer.cs">
-      <DependentUpon>201607301215211_AddBioPropertyToUserEntity.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\201607301802388_ChangeCopyEntityToNotRequireBody.cs" />
-    <Compile Include="Migrations\201607301802388_ChangeCopyEntityToNotRequireBody.Designer.cs">
-      <DependentUpon>201607301802388_ChangeCopyEntityToNotRequireBody.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\201607311849235_AddPostRolesEntity.cs" />
-    <Compile Include="Migrations\201607311849235_AddPostRolesEntity.Designer.cs">
-      <DependentUpon>201607311849235_AddPostRolesEntity.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\201608012107556_AddPageRolesEntity.cs" />
-    <Compile Include="Migrations\201608012107556_AddPageRolesEntity.Designer.cs">
-      <DependentUpon>201608012107556_AddPageRolesEntity.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\201609082029575_AddPageSectionRolesEntity.cs" />
-    <Compile Include="Migrations\201609082029575_AddPageSectionRolesEntity.Designer.cs">
-      <DependentUpon>201609082029575_AddPageSectionRolesEntity.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\201609152000410_ExtendPostToIncludeViews.cs" />
-    <Compile Include="Migrations\201609152000410_ExtendPostToIncludeViews.Designer.cs">
-      <DependentUpon>201609152000410_ExtendPostToIncludeViews.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\201609161855520_AddFontEntityForTheming.cs" />
-    <Compile Include="Migrations\201609161855520_AddFontEntityForTheming.Designer.cs">
-      <DependentUpon>201609161855520_AddFontEntityForTheming.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\201609170832180_AddInitialThemeEntity.cs" />
-    <Compile Include="Migrations\201609170832180_AddInitialThemeEntity.Designer.cs">
-      <DependentUpon>201609170832180_AddInitialThemeEntity.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\201609170909041_ExtendPagesEntityWithTheme.cs" />
-    <Compile Include="Migrations\201609170909041_ExtendPagesEntityWithTheme.Designer.cs">
-      <DependentUpon>201609170909041_ExtendPagesEntityWithTheme.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\201609171705597_RemoveThemeFromIndividualPages.cs" />
-    <Compile Include="Migrations\201609171705597_RemoveThemeFromIndividualPages.Designer.cs">
-      <DependentUpon>201609171705597_RemoveThemeFromIndividualPages.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\201609221930047_ExtendThemePropertiesWithFontSizes.cs" />
-    <Compile Include="Migrations\201609221930047_ExtendThemePropertiesWithFontSizes.Designer.cs">
-      <DependentUpon>201609221930047_ExtendThemePropertiesWithFontSizes.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\201609241552502_UpdateMenuItemEntityWithLinkURLAndRoles.cs" />
-    <Compile Include="Migrations\201609241552502_UpdateMenuItemEntityWithLinkURLAndRoles.Designer.cs">
-      <DependentUpon>201609241552502_UpdateMenuItemEntityWithLinkURLAndRoles.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\201609241939510_ExtendMenuItemWithLinkIcon.cs" />
-    <Compile Include="Migrations\201609241939510_ExtendMenuItemWithLinkIcon.Designer.cs">
-      <DependentUpon>201609241939510_ExtendMenuItemWithLinkIcon.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\201609262043195_ExtendThemeEntityWithColourOptions.cs" />
-    <Compile Include="Migrations\201609262043195_ExtendThemeEntityWithColourOptions.Designer.cs">
-      <DependentUpon>201609262043195_ExtendThemeEntityWithColourOptions.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\201610091045086_CleanupPageBuilderEntities.cs" />
-    <Compile Include="Migrations\201610091045086_CleanupPageBuilderEntities.Designer.cs">
-      <DependentUpon>201610091045086_CleanupPageBuilderEntities.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\201703081019598_AddPageSectionBackupEntity.cs" />
-    <Compile Include="Migrations\201703081019598_AddPageSectionBackupEntity.Designer.cs">
-      <DependentUpon>201703081019598_AddPageSectionBackupEntity.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\201703101042490_AddPageAssociationEntity.cs" />
-    <Compile Include="Migrations\201703101042490_AddPageAssociationEntity.Designer.cs">
-      <DependentUpon>201703101042490_AddPageAssociationEntity.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\201703101043101_SeedPageAssociationEntity.cs" />
-    <Compile Include="Migrations\201703101043101_SeedPageAssociationEntity.Designer.cs">
-      <DependentUpon>201703101043101_SeedPageAssociationEntity.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\201703101150152_UpdatePageSectionEntityToRemoveLegacyProperties.cs" />
-    <Compile Include="Migrations\201703101150152_UpdatePageSectionEntityToRemoveLegacyProperties.Designer.cs">
-      <DependentUpon>201703101150152_UpdatePageSectionEntityToRemoveLegacyProperties.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\201703111606414_ConvertSectionRolesIntoAssociationRoles.cs" />
-    <Compile Include="Migrations\201703111606414_ConvertSectionRolesIntoAssociationRoles.Designer.cs">
-      <DependentUpon>201703111606414_ConvertSectionRolesIntoAssociationRoles.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\201703242023520_AvoidReservedTypeNames.cs" />
-    <Compile Include="Migrations\201703242023520_AvoidReservedTypeNames.Designer.cs">
-      <DependentUpon>201703242023520_AvoidReservedTypeNames.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\201703291711230_UpdateBuilderAreaName.cs" />
-    <Compile Include="Migrations\201703291711230_UpdateBuilderAreaName.Designer.cs">
-      <DependentUpon>201703291711230_UpdateBuilderAreaName.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\201707211220449_StripWebsiteAddressFromUploadedContent.cs" />
-    <Compile Include="Migrations\201707211220449_StripWebsiteAddressFromUploadedContent.Designer.cs">
-      <DependentUpon>201707211220449_StripWebsiteAddressFromUploadedContent.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\201708101940509_ExtendRolesEntityWithIsAssignableProperty.cs" />
-    <Compile Include="Migrations\201708101940509_ExtendRolesEntityWithIsAssignableProperty.Designer.cs">
-      <DependentUpon>201708101940509_ExtendRolesEntityWithIsAssignableProperty.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\201708101946158_UpdateExistingAdminAndEditorRoles.cs" />
-    <Compile Include="Migrations\201708101946158_UpdateExistingAdminAndEditorRoles.Designer.cs">
-      <DependentUpon>201708101946158_UpdateExistingAdminAndEditorRoles.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\Configuration.cs" />
-    <Compile Include="PortalEntityModel.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Seed\MediaSeed.cs" />
-    <Compile Include="Seed\MenuSeed.cs" />
-    <Compile Include="Seed\PageComponentTypeSeed.cs" />
-    <Compile Include="Seed\PageSectionTypeSeed.cs" />
-    <Compile Include="Seed\CopySeed.cs" />
-    <Compile Include="Seed\PostSeed.cs" />
-    <Compile Include="Seed\PageSeed.cs" />
-    <Compile Include="Seed\PostCategorySeed.cs" />
-    <Compile Include="Seed\RoleSeed.cs" />
-    <Compile Include="Seed\SettingSeed.cs" />
-    <Compile Include="Seed\ThemeSeed.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="App.config" />
-    <None Include="packages.config">
-      <SubType>Designer</SubType>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Migrations\201607122131202_InitialPortalCMSSchema.resx">
-      <DependentUpon>201607122131202_InitialPortalCMSSchema.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\201607142300116_AddAnalyticsEntities.resx">
-      <DependentUpon>201607142300116_AddAnalyticsEntities.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\201607161849511_AddPageSectionOrderToPageSections.resx">
-      <DependentUpon>201607161849511_AddPageSectionOrderToPageSections.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\201607171344335_ExtendAnalyticStorage.resx">
-      <DependentUpon>201607171344335_ExtendAnalyticStorage.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\201607171347205_RemoveRequirementForReferralAnalytic.resx">
-      <DependentUpon>201607171347205_RemoveRequirementForReferralAnalytic.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\201607211935456_AddAvatarPathToUserEntity.resx">
-      <DependentUpon>201607211935456_AddAvatarPathToUserEntity.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\201607241651305_ExtendSectionTypeEntity.resx">
-      <DependentUpon>201607241651305_ExtendSectionTypeEntity.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\201607271844003_AddUserTokenEntity.resx">
-      <DependentUpon>201607271844003_AddUserTokenEntity.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\201607271854537_ExtendUserTokenEntity.resx">
-      <DependentUpon>201607271854537_ExtendUserTokenEntity.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\201607301215211_AddBioPropertyToUserEntity.resx">
-      <DependentUpon>201607301215211_AddBioPropertyToUserEntity.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\201607301802388_ChangeCopyEntityToNotRequireBody.resx">
-      <DependentUpon>201607301802388_ChangeCopyEntityToNotRequireBody.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\201607311849235_AddPostRolesEntity.resx">
-      <DependentUpon>201607311849235_AddPostRolesEntity.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\201608012107556_AddPageRolesEntity.resx">
-      <DependentUpon>201608012107556_AddPageRolesEntity.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\201609082029575_AddPageSectionRolesEntity.resx">
-      <DependentUpon>201609082029575_AddPageSectionRolesEntity.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\201609152000410_ExtendPostToIncludeViews.resx">
-      <DependentUpon>201609152000410_ExtendPostToIncludeViews.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\201609161855520_AddFontEntityForTheming.resx">
-      <DependentUpon>201609161855520_AddFontEntityForTheming.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\201609170832180_AddInitialThemeEntity.resx">
-      <DependentUpon>201609170832180_AddInitialThemeEntity.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\201609170909041_ExtendPagesEntityWithTheme.resx">
-      <DependentUpon>201609170909041_ExtendPagesEntityWithTheme.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\201609171705597_RemoveThemeFromIndividualPages.resx">
-      <DependentUpon>201609171705597_RemoveThemeFromIndividualPages.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\201609221930047_ExtendThemePropertiesWithFontSizes.resx">
-      <DependentUpon>201609221930047_ExtendThemePropertiesWithFontSizes.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\201609241552502_UpdateMenuItemEntityWithLinkURLAndRoles.resx">
-      <DependentUpon>201609241552502_UpdateMenuItemEntityWithLinkURLAndRoles.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\201609241939510_ExtendMenuItemWithLinkIcon.resx">
-      <DependentUpon>201609241939510_ExtendMenuItemWithLinkIcon.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\201609262043195_ExtendThemeEntityWithColourOptions.resx">
-      <DependentUpon>201609262043195_ExtendThemeEntityWithColourOptions.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\201610091045086_CleanupPageBuilderEntities.resx">
-      <DependentUpon>201610091045086_CleanupPageBuilderEntities.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\201703081019598_AddPageSectionBackupEntity.resx">
-      <DependentUpon>201703081019598_AddPageSectionBackupEntity.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\201703101042490_AddPageAssociationEntity.resx">
-      <DependentUpon>201703101042490_AddPageAssociationEntity.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\201703101043101_SeedPageAssociationEntity.resx">
-      <DependentUpon>201703101043101_SeedPageAssociationEntity.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\201703101150152_UpdatePageSectionEntityToRemoveLegacyProperties.resx">
-      <DependentUpon>201703101150152_UpdatePageSectionEntityToRemoveLegacyProperties.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\201703111606414_ConvertSectionRolesIntoAssociationRoles.resx">
-      <DependentUpon>201703111606414_ConvertSectionRolesIntoAssociationRoles.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\201703242023520_AvoidReservedTypeNames.resx">
-      <DependentUpon>201703242023520_AvoidReservedTypeNames.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\201703291711230_UpdateBuilderAreaName.resx">
-      <DependentUpon>201703291711230_UpdateBuilderAreaName.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\201707211220449_StripWebsiteAddressFromUploadedContent.resx">
-      <DependentUpon>201707211220449_StripWebsiteAddressFromUploadedContent.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\201708101940509_ExtendRolesEntityWithIsAssignableProperty.resx">
-      <DependentUpon>201708101940509_ExtendRolesEntityWithIsAssignableProperty.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\201708101946158_UpdateExistingAdminAndEditorRoles.resx">
-      <DependentUpon>201708101946158_UpdateExistingAdminAndEditorRoles.cs</DependentUpon>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup />
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/Portal.CMS.Entities/PortalEntityModel.cs b/Portal.CMS.Entities/PortalEntityModel.cs
deleted file mode 100644
index b476513..0000000
--- a/Portal.CMS.Entities/PortalEntityModel.cs
+++ /dev/null
@@ -1,77 +0,0 @@
-using Portal.CMS.Entities.Entities;
-using System.Data.Common;
-using System.Data.Entity;
-
-namespace Portal.CMS.Entities
-{
-    public class PortalEntityModel : DbContext
-    {
-        #region Dependencies
-
-        public PortalEntityModel(DbConnection connection) : base(connection, true)
-        {
-        }
-
-        public PortalEntityModel() : base("name=PortalEntityModel")
-        {
-        }
-
-        #endregion Dependencies
-
-        public virtual DbSet<User> Users { get; set; }
-
-        public virtual DbSet<Role> Roles { get; set; }
-
-        public virtual DbSet<UserRole> UserRoles { get; set; }
-
-        public virtual DbSet<UserToken> UserTokens { get; set; }
-
-        public virtual DbSet<AnalyticPageView> AnalyticPageViews { get; set; }
-
-        public virtual DbSet<AnalyticPostView> AnalyticPostViews { get; set; }
-
-        public virtual DbSet<Post> Posts { get; set; }
-
-        public virtual DbSet<PostCategory> PostCategories { get; set; }
-
-        public virtual DbSet<PostImage> PostImages { get; set; }
-
-        public virtual DbSet<PostComment> PostComments { get; set; }
-
-        public virtual DbSet<PostRole> PostRoles { get; set; }
-
-        public virtual DbSet<Image> Images { get; set; }
-
-        public virtual DbSet<CopyItem> CopyItems { get; set; }
-
-        public virtual DbSet<MenuSystem> Menus { get; set; }
-
-        public virtual DbSet<MenuItem> MenuItems { get; set; }
-
-        public virtual DbSet<MenuItemRole> MenuItemRoles { get; set; }
-
-        public virtual DbSet<Setting> Settings { get; set; }
-
-        public virtual DbSet<Page> Pages { get; set; }
-
-        public virtual DbSet<PageAssociation> PageAssociations { get; set; }
-
-        public virtual DbSet<PageSection> PageSections { get; set; }
-
-        public virtual DbSet<PagePartial> PagePartials { get; set; }
-
-        public virtual DbSet<PageSectionBackup> PageSectionBackups { get; set; }
-
-        public virtual DbSet<PageSectionType> PageSectionTypes { get; set; }
-
-        public virtual DbSet<PageComponentType> PageComponentTypes { get; set; }
-
-        public virtual DbSet<PageRole> PageRoles { get; set; }
-
-        public virtual DbSet<PageAssociationRole> PageAssociationRoles { get; set; }
-
-        public virtual DbSet<Font> Fonts { get; set; }
-
-        public virtual DbSet<CustomTheme> Themes { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/Portal.CMS.Entities/Seed/PostSeed.cs b/Portal.CMS.Entities/Seed/PostSeed.cs
deleted file mode 100644
index 749a840..0000000
--- a/Portal.CMS.Entities/Seed/PostSeed.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using Portal.CMS.Entities.Entities;
-using Portal.CMS.Entities.Enumerators;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace Portal.CMS.Entities.Seed
-{
-    public static class PostSeed
-    {
-        public static void Seed(PortalEntityModel context)
-        {
-            if (!context.Posts.Any())
-            {
-                var image = context.Images.First(x => x.ImageCategory == ImageCategory.General);
-
-                var firstPost = new Post
-                {
-                    PostTitle = "My First Post",
-                    PostDescription = "This is just an example post to get you started, why not change it or create a new post?",
-                    PostBody = "<p>Coming Soon...</p>",
-                    IsPublished = true,
-                    DateAdded = DateTime.Now,
-                    DateUpdated = DateTime.Now,
-                    PostCategoryId = context.PostCategories.First().PostCategoryId,
-                    PostImages = new List<PostImage>
-                    {
-                        new PostImage() { ImageId = image.ImageId, PostImageType = PostImageType.Banner }
-                    }
-                };
-
-                context.Posts.Add(firstPost);
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/Portal.CMS.Entities/Seed/RoleSeed.cs b/Portal.CMS.Entities/Seed/RoleSeed.cs
deleted file mode 100644
index 9f9e92c..0000000
--- a/Portal.CMS.Entities/Seed/RoleSeed.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using Portal.CMS.Entities.Entities;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace Portal.CMS.Entities.Seed
-{
-    public static class RoleSeed
-    {
-        public static void Seed(PortalEntityModel context)
-        {
-            var roleList = context.Roles.ToList();
-
-            var newRoles = new List<Role>();
-
-            if (!roleList.Any(x => x.RoleName == "Admin"))
-                newRoles.Add(new Role { RoleName = "Admin", IsAssignable = true });
-
-            if (!roleList.Any(x => x.RoleName == "Editor"))
-                newRoles.Add(new Role { RoleName = "Editor", IsAssignable = true });
-
-            if (!roleList.Any(x => x.RoleName == "Authenticated"))
-                newRoles.Add(new Role { RoleName = "Authenticated", IsAssignable = false });
-
-            if (!roleList.Any(x => x.RoleName == "Anonymous"))
-                newRoles.Add(new Role { RoleName = "Anonymous", IsAssignable = false });
-
-            if (newRoles.Any())
-            {
-                context.Roles.AddRange(newRoles);
-
-                context.SaveChanges();
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/Portal.CMS.Entities/packages.config b/Portal.CMS.Entities/packages.config
deleted file mode 100644
index ef2c0e7..0000000
--- a/Portal.CMS.Entities/packages.config
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="EntityFramework" version="6.2.0" targetFramework="net461" />
-  <package id="HtmlAgilityPack" version="1.8.9" targetFramework="net461" />
-</packages>
\ No newline at end of file
diff --git a/Portal.CMS.Services/Authentication/LoginService.cs b/Portal.CMS.Services/Authentication/LoginService.cs
deleted file mode 100644
index 3a3168f..0000000
--- a/Portal.CMS.Services/Authentication/LoginService.cs
+++ /dev/null
@@ -1,68 +0,0 @@
-using Portal.CMS.Entities;
-using System;
-using System.Data.Entity;
-using System.Security.Cryptography;
-using System.Threading.Tasks;
-
-namespace Portal.CMS.Services.Authentication
-{
-    public interface ILoginService
-    {
-        Task<int?> LoginAsync(string emailAddress, string password);
-
-        Task<int?> SSOAsync(int userId, string token);
-    }
-
-    public class LoginService : ILoginService
-    {
-        #region Dependencies
-
-        readonly PortalEntityModel _context;
-        readonly ITokenService _tokenService;
-
-        public LoginService(PortalEntityModel context, ITokenService tokenService)
-        {
-            _context = context;
-            _tokenService = tokenService;
-        }
-
-        #endregion Dependencies
-
-        public async Task<int?> LoginAsync(string emailAddress, string password)
-        {
-            var userAccount = await _context.Users.FirstOrDefaultAsync(x => x.EmailAddress.Equals(emailAddress, StringComparison.OrdinalIgnoreCase));
-            if (userAccount == null) return null;
-
-            if (!CompareSecurePassword(password, userAccount.Password))
-                return null;
-
-            return userAccount.UserId;
-        }
-
-        public async Task<int?> SSOAsync(int userId, string token)
-        {
-            var tokenResult = await _tokenService.RedeemSSOTokenAsync(userId, token);
-
-            if (string.IsNullOrWhiteSpace(tokenResult))
-                return userId;
-
-            return null;
-        }
-
-        private static bool CompareSecurePassword(string passwordAttempt, string passwordActual)
-        {
-            var savedPasswordHash = passwordActual;
-            var hashBytes = Convert.FromBase64String(savedPasswordHash);
-            var salt = new byte[16];
-            Array.Copy(hashBytes, 0, salt, 0, 16);
-            using (var pbkdf2 = new Rfc2898DeriveBytes(passwordAttempt, salt, 10000))
-            {
-                var hash = pbkdf2.GetBytes(20);
-                for (int i = 0; i < 20; i++)
-                    if (hashBytes[i + 16] != hash[i])
-                        return false;
-                return true;
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/Portal.CMS.Services/Authentication/RegistrationService.cs b/Portal.CMS.Services/Authentication/RegistrationService.cs
deleted file mode 100644
index 382b8c6..0000000
--- a/Portal.CMS.Services/Authentication/RegistrationService.cs
+++ /dev/null
@@ -1,83 +0,0 @@
-using Portal.CMS.Entities;
-using Portal.CMS.Entities.Entities;
-using System;
-using System.Data.Entity;
-using System.Security.Cryptography;
-using System.Threading.Tasks;
-
-namespace Portal.CMS.Services.Authentication
-{
-    public interface IRegistrationService
-    {
-        Task<int?> RegisterAsync(string emailAddress, string password, string givenName, string familyName);
-
-        Task ChangePasswordAsync(int userId, string newPassword);
-    }
-
-    public class RegistrationService : IRegistrationService
-    {
-        #region Dependencies
-
-        readonly PortalEntityModel _context;
-
-        public RegistrationService(PortalEntityModel context)
-        {
-            _context = context;
-        }
-
-        #endregion Dependencies
-
-        public async Task<int?> RegisterAsync(string emailAddress, string password, string givenName, string familyName)
-        {
-            if (await _context.Users.AnyAsync(x => x.EmailAddress.Equals(emailAddress, StringComparison.OrdinalIgnoreCase)))
-                return -1;
-
-            var userAccount = new User
-            {
-                EmailAddress = emailAddress,
-                Password = GenerateSecurePassword(password),
-                GivenName = givenName,
-                FamilyName = familyName,
-                AvatarImagePath = "/Areas/Admin/Content/Images/profile-image-male.png",
-                DateAdded = DateTime.Now,
-                DateUpdated = DateTime.Now
-            };
-
-            _context.Users.Add(userAccount);
-
-            await _context.SaveChangesAsync();
-
-            return userAccount.UserId;
-        }
-
-        public async Task ChangePasswordAsync(int userId, string newPassword)
-        {
-            var userAccount = await _context.Users.SingleOrDefaultAsync(x => x.UserId == userId);
-            if (userAccount == null) return;
-
-            userAccount.Password = GenerateSecurePassword(newPassword);
-            userAccount.DateUpdated = DateTime.Now;
-
-            await _context.SaveChangesAsync();
-        }
-
-        private static string GenerateSecurePassword(string password)
-        {
-            // http://stackoverflow.com/questions/4181198/how-to-hash-a-password
-            using (var rNGCryptoServiceProvider = new RNGCryptoServiceProvider())
-            {
-                var salt = new byte[16];
-                rNGCryptoServiceProvider.GetBytes(salt);
-                using (var pbkdf2 = new Rfc2898DeriveBytes(password, salt, 10000))
-                {
-                    var hash = pbkdf2.GetBytes(20);
-                    var hashBytes = new byte[36];
-                    Array.Copy(salt, 0, hashBytes, 0, 16);
-                    Array.Copy(hash, 0, hashBytes, 16, 20);
-                    var savedPasswordHash = Convert.ToBase64String(hashBytes);
-                    return savedPasswordHash;
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/Portal.CMS.Services/Authentication/RoleService.cs b/Portal.CMS.Services/Authentication/RoleService.cs
deleted file mode 100644
index b84750e..0000000
--- a/Portal.CMS.Services/Authentication/RoleService.cs
+++ /dev/null
@@ -1,166 +0,0 @@
-using Portal.CMS.Entities;
-using Portal.CMS.Entities.Entities;
-using System.Collections.Generic;
-using System.Data.Entity;
-using System.Linq;
-using System.Threading.Tasks;
-
-namespace Portal.CMS.Services.Authentication
-{
-    public interface IRoleService
-    {
-        Task<IEnumerable<Role>> GetAsync(int? userId);
-
-        Task<List<Role>> GetAsync();
-
-        Task<List<Role>> GetUserAssignableRolesAsync();
-
-        Task<Role> GetAsync(int roleId);
-
-        Task<int> AddAsync(string roleName);
-
-        Task EditAsync(int roleId, string roleName);
-
-        Task UpdateAsync(int userId, List<string> roleList);
-
-        Task DeleteAsync(int roleId);
-
-        bool Validate(IEnumerable<Role> entityRoles, IEnumerable<Role> userRoles);
-    }
-
-    public class RoleService : IRoleService
-    {
-        #region Dependencies
-
-        readonly PortalEntityModel _context;
-        readonly IUserService _userService;
-
-        public RoleService(PortalEntityModel context, IUserService userService)
-        {
-            _context = context;
-            _userService = userService;
-        }
-
-        #endregion Dependencies
-
-        public async Task<IEnumerable<Role>> GetAsync(int? userId)
-        {
-            if (userId.HasValue)
-            {
-                var userRoles = await _context.UserRoles.Where(x => x.UserId == userId.Value).Select(x => x.Role).ToListAsync();
-
-                return userRoles;
-            }
-
-            return new List<Role> { new Role { RoleName = "Anonymous" } };
-        }
-
-        public async Task<List<Role>> GetAsync()
-        {
-            var results = await _context.Roles.OrderBy(x => x.RoleName).ToListAsync();
-
-            return results;
-        }
-
-        public async Task<List<Role>> GetUserAssignableRolesAsync()
-        {
-            var results = await _context.Roles.Where(x => x.IsAssignable).OrderBy(x => x.RoleName).ToListAsync();
-
-            return results;
-        }
-
-        public async Task<Role> GetAsync(int roleId)
-        {
-            var role = await _context.Roles.SingleOrDefaultAsync(x => x.RoleId == roleId);
-
-            return role;
-        }
-
-        public async Task<int> AddAsync(string roleName)
-        {
-            var newRole = new Role
-            {
-                RoleName = roleName
-            };
-
-            _context.Roles.Add(newRole);
-
-            await _context.SaveChangesAsync();
-
-            return newRole.RoleId;
-        }
-
-        public async Task EditAsync(int roleId, string roleName)
-        {
-            var role = await _context.Roles.SingleOrDefaultAsync(x => x.RoleId == roleId);
-
-            role.RoleName = roleName;
-
-            await _context.SaveChangesAsync();
-        }
-
-        public async Task DeleteAsync(int roleId)
-        {
-            var role = await _context.Roles.SingleOrDefaultAsync(x => x.RoleId == roleId);
-            if (role == null) return;
-
-            _context.Roles.Remove(role);
-
-            await _context.SaveChangesAsync();
-        }
-
-        public async Task UpdateAsync(int userId, List<string> roleList)
-        {
-            var user = await _context.Users.SingleOrDefaultAsync(x => x.UserId == userId);
-            if (user == null) return;
-
-            var systemRoles = await GetAsync();
-
-            if (user.Roles != null)
-            {
-                while (user.Roles.Any())
-                {
-                    var role = user.Roles.First();
-
-                    _context.UserRoles.Remove(role);
-                }
-            }
-
-            foreach (var role in roleList)
-            {
-                var matchedRole = systemRoles.FirstOrDefault(x => x.RoleName.Equals(role, System.StringComparison.OrdinalIgnoreCase));
-
-                if (matchedRole == null)
-                    continue;
-
-                var userRole = new UserRole
-                {
-                    RoleId = matchedRole.RoleId,
-                    UserId = user.UserId
-                };
-
-                _context.UserRoles.Add(userRole);
-            }
-
-            await _context.SaveChangesAsync();
-        }
-
-        public bool Validate(IEnumerable<Role> entityRoles, IEnumerable<Role> userRoles)
-        {
-            // PASS: Where no roles are specified on the entity, access is granted to all users.
-            if (!entityRoles.Any())
-                return true;
-
-            // PASS: Administrators can access any content.
-            if (userRoles.Any(x => x.RoleName.Equals("Admin", System.StringComparison.OrdinalIgnoreCase)))
-                return true;
-
-            // EVALUATE: Every Role on the Entity. One match grants access.
-            foreach (var role in entityRoles)
-                if (userRoles.Select(x => x.RoleName).Contains(role.RoleName))
-                    return true;
-
-            return false;
-        }
-    }
-}
\ No newline at end of file
diff --git a/Portal.CMS.Services/Authentication/TokenService.cs b/Portal.CMS.Services/Authentication/TokenService.cs
deleted file mode 100644
index 4d4427a..0000000
--- a/Portal.CMS.Services/Authentication/TokenService.cs
+++ /dev/null
@@ -1,94 +0,0 @@
-using Portal.CMS.Entities;
-using Portal.CMS.Entities.Entities;
-using Portal.CMS.Entities.Enumerators;
-using System;
-using System.Data.Entity;
-using System.Threading.Tasks;
-
-namespace Portal.CMS.Services.Authentication
-{
-    public interface ITokenService
-    {
-        Task<string> AddAsync(string emailAddress, UserTokenType userTokenType);
-
-        Task<string> RedeemPasswordTokenAsync(string token, string emailAddress, string password);
-
-        Task<string> RedeemSSOTokenAsync(int userid, string token);
-    }
-
-    public class TokenService : ITokenService
-    {
-        #region Dependencies
-
-        readonly PortalEntityModel _context;
-        readonly IUserService _userService;
-        readonly IRegistrationService _registrationService;
-
-        public TokenService(PortalEntityModel context, IUserService userService, IRegistrationService registrationService)
-        {
-            _context = context;
-            _userService = userService;
-            _registrationService = registrationService;
-        }
-
-        #endregion Dependencies
-
-        public async Task<string> AddAsync(string emailAddress, UserTokenType userTokenType)
-        {
-            var user = await _userService.GetAsync(emailAddress);
-            if (user == null) return string.Empty;
-
-            var userToken = new UserToken
-            {
-                UserId = user.UserId,
-                Token = Guid.NewGuid().ToString(),
-                UserTokenType = userTokenType,
-                DateAdded = DateTime.Now
-            };
-
-            _context.UserTokens.Add(userToken);
-
-            await _context.SaveChangesAsync();
-
-            return userToken.Token;
-        }
-
-        public async Task<string> RedeemPasswordTokenAsync(string token, string emailAddress, string password)
-        {
-            var userToken = await _context.UserTokens.FirstOrDefaultAsync(x => x.Token.Equals(token, StringComparison.OrdinalIgnoreCase));
-
-            if (userToken == null)
-                return "Invalid Token. Please Request Reset Password Token Again...";
-
-            if (!userToken.User.EmailAddress.Equals(emailAddress, StringComparison.OrdinalIgnoreCase))
-                return "Invalid Token. This Token does not match the Email Address you entered...";
-
-            if (userToken.DateRedeemed.HasValue)
-                return "Invalid Token. This Token has already been used";
-
-            await _registrationService.ChangePasswordAsync(userToken.User.UserId, password);
-
-            userToken.DateRedeemed = DateTime.Now;
-            await _context.SaveChangesAsync();
-
-            return string.Empty;
-        }
-
-        public async Task<string> RedeemSSOTokenAsync(int userid, string token)
-        {
-            var userToken = await _context.UserTokens.FirstOrDefaultAsync(x => x.Token.Equals(token, StringComparison.OrdinalIgnoreCase) && x.UserId == userid);
-
-            if (userToken == null)
-                return "Invalid Token.";
-
-            if (userToken.DateRedeemed.HasValue)
-                return "Invalid Token. This Token has already been used.";
-
-            userToken.DateRedeemed = DateTime.Now;
-
-            await _context.SaveChangesAsync();
-
-            return string.Empty;
-        }
-    }
-}
\ No newline at end of file
diff --git a/Portal.CMS.Services/Authentication/UserService.cs b/Portal.CMS.Services/Authentication/UserService.cs
deleted file mode 100644
index 265e02f..0000000
--- a/Portal.CMS.Services/Authentication/UserService.cs
+++ /dev/null
@@ -1,124 +0,0 @@
-using Portal.CMS.Entities;
-using Portal.CMS.Entities.Entities;
-using System.Collections.Generic;
-using System.Data.Entity;
-using System.Linq;
-using System.Threading.Tasks;
-
-namespace Portal.CMS.Services.Authentication
-{
-    public interface IUserService
-    {
-        Task<User> GetUserAsync(int userId);
-
-        Task<IEnumerable<User>> GetAsync();
-
-        Task<User> GetAsync(string emailAddress);
-
-        Task<IEnumerable<User>> GetAsync(List<string> roleNames);
-
-        Task UpdateDetailsAsync(int userId, string emailAddress, string givenName, string familyName);
-
-        Task UpdateAvatarAsync(int userId, string avatarImagePath);
-
-        Task UpdateBioAsync(int userId, string bio);
-
-        Task DeleteUserAsync(int userId);
-
-        Task<int> GetUserCountAsync();
-    }
-
-    public class UserService : IUserService
-    {
-        #region Dependencies
-
-        readonly PortalEntityModel _context;
-
-        public UserService(PortalEntityModel context)
-        {
-            _context = context;
-        }
-
-        #endregion Dependencies
-
-        public async Task<User> GetUserAsync(int userId)
-        {
-            var result = await _context.Users.SingleOrDefaultAsync(x => x.UserId == userId);
-
-            return result;
-        }
-
-        public async Task<User> GetAsync(string emailAddress)
-        {
-            var result = await _context.Users.FirstOrDefaultAsync(x => x.EmailAddress.Equals(emailAddress, System.StringComparison.OrdinalIgnoreCase));
-
-            return result;
-        }
-
-        public async Task<IEnumerable<User>> GetAsync()
-        {
-            var userList = await _context.Users.OrderBy(x => x.GivenName).ThenBy(x => x.FamilyName).ThenBy(x => x.UserId).ToListAsync();
-
-            return userList;
-        }
-
-        public async Task<IEnumerable<User>> GetAsync(List<string> roleNames)
-        {
-            var results = new List<User>();
-
-            foreach (var user in await _context.Users.ToListAsync())
-            {
-                foreach (var roleName in roleNames)
-                {
-                    if (user.Roles.Any(x => x.Role.RoleName == roleName))
-                        results.Add(user);
-                }
-            }
-
-            return results.Distinct().OrderBy(x => x.GivenName).ThenBy(x => x.FamilyName).ThenBy(x => x.UserId);
-        }
-
-        public async Task<int> GetUserCountAsync()
-        {
-            return await _context.Users.CountAsync();
-        }
-
-        public async Task UpdateDetailsAsync(int userId, string emailAddress, string givenName, string familyName)
-        {
-            var user = await _context.Users.SingleOrDefaultAsync(x => x.UserId == userId);
-
-            user.EmailAddress = emailAddress;
-            user.GivenName = givenName;
-            user.FamilyName = familyName;
-
-            await _context.SaveChangesAsync();
-        }
-
-        public async Task UpdateAvatarAsync(int userId, string avatarImagePath)
-        {
-            var user = await _context.Users.SingleOrDefaultAsync(x => x.UserId == userId);
-
-            user.AvatarImagePath = avatarImagePath;
-
-            await _context.SaveChangesAsync();
-        }
-
-        public async Task UpdateBioAsync(int userId, string bio)
-        {
-            var user = await _context.Users.SingleOrDefaultAsync(x => x.UserId == userId);
-
-            user.Bio = bio;
-
-            await _context.SaveChangesAsync();
-        }
-
-        public async Task DeleteUserAsync(int userId)
-        {
-            var user = await _context.Users.SingleOrDefaultAsync(x => x.UserId == userId);
-
-            _context.Users.Remove(user);
-
-            await _context.SaveChangesAsync();
-        }
-    }
-}
\ No newline at end of file
diff --git a/Portal.CMS.Services/Posts/PostService.cs b/Portal.CMS.Services/Posts/PostService.cs
deleted file mode 100644
index 0157764..0000000
--- a/Portal.CMS.Services/Posts/PostService.cs
+++ /dev/null
@@ -1,277 +0,0 @@
-using Portal.CMS.Entities;
-using Portal.CMS.Entities.Entities;
-using Portal.CMS.Services.Authentication;
-using System;
-using System.Collections.Generic;
-using System.Data.Entity;
-using System.Linq;
-using System.Threading.Tasks;
-
-namespace Portal.CMS.Services.Posts
-{
-    public interface IPostService
-    {
-        Task<Post> ReadAsync(int? userId, int postId);
-
-        Task<List<Post>> ReadAsync(int? userId, string postCategoryName);
-
-        Task<Post> GetAsync(int postId);
-
-        Task<List<Post>> GetAsync(string postCategoryName, bool published);
-
-        Task<Post> GetLatestAsync();
-
-        Task<int> CreateAsync(string postTitle, int postCategoryId, int postAuthorUserId, string postDescription, string postBody);
-
-        Task EditAsync(int postId, string postTitle, int postCategoryId, int postAuthorUserId, string postDescription, string postBody);
-
-        Task EditAsync(int postId, string postBody);
-
-        Task DescriptionAsync(int postId, string description);
-
-        Task HeadlineAsync(int postId, string headline);
-
-        Task DeleteAsync(int postId);
-
-        Task PublishAsync(int postId);
-
-        Task DraftAsync(int postId);
-
-        Task RolesAsync(int postId, List<string> roleList);
-    }
-
-    public class PostService : IPostService
-    {
-        #region Dependencies
-
-        readonly PortalEntityModel _context;
-        readonly IUserService _userService;
-        readonly IRoleService _roleService;
-
-        public PostService(PortalEntityModel context, IUserService userService, IRoleService roleService)
-        {
-            _context = context;
-            _userService = userService;
-            _roleService = roleService;
-        }
-
-        #endregion Dependencies
-
-        public async Task<Post> ReadAsync(int? userId, int postId)
-        {
-            var post = await _context.Posts.SingleOrDefaultAsync(x => x.PostId == postId && x.IsPublished);
-
-            var userRoles = await _roleService.GetAsync(userId);
-
-            if (_roleService.Validate(post.PostRoles.Select(x => x.Role), userRoles))
-                return post;
-
-            return null;
-        }
-
-        public async Task<List<Post>> ReadAsync(int? userId, string postCategoryName)
-        {
-            var userRoleList = new List<string>();
-            var isAdministrator = false;
-
-            if (userId.HasValue)
-            {
-                var user = await _userService.GetUserAsync(userId.Value);
-
-                if (user.Roles.Any())
-                    userRoleList.AddRange(user.Roles.Select(x => x.Role.RoleName));
-
-                if (user.Roles.Any(x => x.Role.RoleName == "Admin"))
-                    isAdministrator = true;
-            }
-
-            var postList = await _context.Posts.Where(x => (postCategoryName == string.Empty || x.PostCategory.PostCategoryName == postCategoryName) && x.IsPublished).ToListAsync();
-
-            var returnList = new List<Post>();
-
-            foreach (var post in postList)
-            {
-                if (isAdministrator)
-                {
-                    returnList.Add(post);
-                    continue;
-                }
-
-                if (!post.PostRoles.Any())
-                {
-                    returnList.Add(post);
-
-                    continue;
-                }
-
-                if (userRoleList.Contains(post.PostRoles.SelectMany(x => x.Role.RoleName)))
-                {
-                    returnList.Add(post);
-
-                    continue;
-                }
-            }
-
-            return returnList.Distinct().OrderByDescending(x => x.DateUpdated).ThenByDescending(x => x.DateAdded).ToList();
-        }
-
-        public async Task<Post> GetAsync(int postId)
-        {
-            var result = await _context.Posts.Include(x => x.PostComments).SingleOrDefaultAsync(x => x.PostId == postId);
-
-            return result;
-        }
-
-        public async Task<List<Post>> GetAsync(string postCategoryName, bool published)
-        {
-            var results = await _context.Posts.Where(x => (x.PostCategory.PostCategoryName.Equals(postCategoryName, StringComparison.OrdinalIgnoreCase) || postCategoryName == string.Empty) && (published && x.IsPublished || !published)).ToListAsync();
-
-            return results.OrderByDescending(x => x.DateUpdated).ThenByDescending(x => x.PostId).ToList();
-        }
-
-        public async Task<Post> GetLatestAsync()
-        {
-            var result = await _context.Posts.Include(x => x.PostComments).Include(x => x.PostImages).Include(x => x.PostCategory).Where(x => x.IsPublished).OrderByDescending(x => x.DateUpdated).FirstOrDefaultAsync();
-
-            return result;
-        }
-
-        public async Task<int> CreateAsync(string postTitle, int postCategoryId, int postAuthorUserId, string postDescription, string postBody)
-        {
-            var post = new Post
-            {
-                PostTitle = postTitle,
-                PostCategoryId = postCategoryId,
-                PostAuthorUserId = postAuthorUserId,
-                PostDescription = postDescription,
-                PostBody = postBody,
-                DateAdded = DateTime.Now,
-                DateUpdated = DateTime.Now
-            };
-
-            _context.Posts.Add(post);
-
-            await _context.SaveChangesAsync();
-
-            return post.PostId;
-        }
-
-        public async Task EditAsync(int postId, string postTitle, int postCategoryId, int postAuthorUserId, string postDescription, string postBody)
-        {
-            var post = await _context.Posts.SingleOrDefaultAsync(x => x.PostId == postId);
-
-            if (post == null)
-                return;
-
-            post.PostTitle = postTitle;
-            post.PostCategoryId = postCategoryId;
-            post.PostAuthorUserId = postAuthorUserId;
-            post.PostDescription = postDescription;
-            post.PostBody = postBody;
-            post.DateUpdated = DateTime.Now;
-
-            await _context.SaveChangesAsync();
-        }
-
-        public async Task EditAsync(int postId, string postBody)
-        {
-            var post = await _context.Posts.SingleOrDefaultAsync(x => x.PostId == postId);
-
-            if (post == null)
-                return;
-
-            post.PostBody = postBody;
-            post.DateUpdated = DateTime.Now;
-
-            await _context.SaveChangesAsync();
-        }
-
-        public async Task DescriptionAsync(int postId, string description)
-        {
-            var post = await _context.Posts.SingleOrDefaultAsync(x => x.PostId == postId);
-
-            if (post == null)
-                return;
-
-            post.PostDescription = description;
-            post.DateUpdated = DateTime.Now;
-
-            await _context.SaveChangesAsync();
-        }
-
-        public async Task HeadlineAsync(int postId, string headline)
-        {
-            var post = await _context.Posts.SingleOrDefaultAsync(x => x.PostId == postId);
-
-            if (post == null)
-                return;
-
-            post.PostTitle = headline;
-            post.DateUpdated = DateTime.Now;
-
-            await _context.SaveChangesAsync();
-        }
-
-        public async Task DeleteAsync(int postId)
-        {
-            var post = await _context.Posts.SingleOrDefaultAsync(x => x.PostId == postId);
-
-            if (post == null)
-                return;
-
-            _context.Posts.Remove(post);
-
-            await _context.SaveChangesAsync();
-        }
-
-        public async Task PublishAsync(int postId)
-        {
-            var post = await _context.Posts.SingleOrDefaultAsync(x => x.PostId == postId);
-
-            if (post == null)
-                return;
-
-            post.IsPublished = true;
-
-            await _context.SaveChangesAsync();
-        }
-
-        public async Task DraftAsync(int postId)
-        {
-            var post = await _context.Posts.SingleOrDefaultAsync(x => x.PostId == postId);
-
-            if (post == null)
-                return;
-
-            post.IsPublished = false;
-
-            await _context.SaveChangesAsync();
-        }
-
-        public async Task RolesAsync(int postId, List<string> roleList)
-        {
-            var post = await GetAsync(postId);
-
-            if (post == null)
-                return;
-
-            var roles = await _context.Roles.ToListAsync();
-
-            if (post.PostRoles != null)
-                foreach (var role in post.PostRoles.ToList())
-                    _context.PostRoles.Remove(role);
-
-            foreach (var roleName in roleList)
-            {
-                var currentRole = roles.FirstOrDefault(x => x.RoleName == roleName);
-
-                if (currentRole == null)
-                    continue;
-
-                _context.PostRoles.Add(new PostRole { PostId = postId, RoleId = currentRole.RoleId });
-            }
-
-            await _context.SaveChangesAsync();
-        }
-    }
-}
\ No newline at end of file
diff --git a/Portal.CMS.Services/Settings/SettingService.cs b/Portal.CMS.Services/Settings/SettingService.cs
deleted file mode 100644
index 8ed56a7..0000000
--- a/Portal.CMS.Services/Settings/SettingService.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-using Portal.CMS.Entities;
-using Portal.CMS.Entities.Entities;
-using System.Data.Entity;
-using System.Threading.Tasks;
-
-namespace Portal.CMS.Services.Settings
-{
-    public interface ISettingService
-    {
-        Task<Setting> GetAsync(string settingName);
-
-        Task EditAsync(string settingName, string settingValue);
-    }
-
-    public class SettingService : ISettingService
-    {
-        #region Dependencies
-
-        readonly PortalEntityModel _context;
-
-        public SettingService(PortalEntityModel context)
-        {
-            _context = context;
-        }
-
-        #endregion Dependencies
-
-        public async Task<Setting> GetAsync(string settingName)
-        {
-            var setting = await _context.Settings.FirstOrDefaultAsync(x => x.SettingName == settingName);
-
-            return setting;
-        }
-
-        public async Task EditAsync(string settingName, string settingValue)
-        {
-            var setting = await _context.Settings.FirstOrDefaultAsync(x => x.SettingName == settingName);
-            if (setting == null) return;
-
-            setting.SettingValue = settingValue;
-
-            await _context.SaveChangesAsync();
-        }
-    }
-}
\ No newline at end of file
diff --git a/Portal.CMS.Services/packages.config b/Portal.CMS.Services/packages.config
deleted file mode 100644
index c74e06c..0000000
--- a/Portal.CMS.Services/packages.config
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Effort.EF6" version="1.3.10" targetFramework="net461" />
-  <package id="EntityFramework" version="6.2.0" targetFramework="net461" />
-  <package id="HtmlAgilityPack" version="1.8.9" targetFramework="net461" />
-  <package id="NMemory" version="2.0.4" targetFramework="net461" />
-  <package id="tommcclean.LogBook" version="1.0.4" targetFramework="net461" />
-</packages>
\ No newline at end of file
diff --git a/Portal.CMS.Web/App_Start/BundleConfig.cs b/Portal.CMS.Web/App_Start/BundleConfig.cs
deleted file mode 100644
index 63a0082..0000000
--- a/Portal.CMS.Web/App_Start/BundleConfig.cs
+++ /dev/null
@@ -1,92 +0,0 @@
-using Portal.CMS.Web.Architecture.Helpers;
-using System.Web.Optimization;
-
-namespace Portal.CMS.Web
-{
-    public static class BundleConfig
-    {
-        public static void RegisterBundles(BundleCollection bundles)
-        {
-            bundles.UseCdn = true;
-            BundleTable.EnableOptimizations = true;
-
-            var cdnRootAddress = SettingHelper.Get("CDN Address");
-
-            RegisterFramework(bundles, cdnRootAddress);
-            RegisterPlugins(bundles, cdnRootAddress);
-        }
-
-        private static void RegisterFramework(BundleCollection bundles, string cdnRootAddress)
-        {
-            bundles.Add(new ScriptBundle("~/Resources/JavaScript/Framework").Include("~/Content/Scripts/Framework/*.js"));
-            bundles.Add(new StyleBundle("~/Resources/CSS/Framework").Include("~/Content/Styles/Framework/*.css", new CssRewriteUrlTransform()));
-
-            bundles.Add(new ScriptBundle("~/Resources/JavaScript/Framework/Administration").Include("~/Content/Scripts/Administration/*.js"));
-            bundles.Add(new StyleBundle("~/Resources/CSS/Framework/Administration").Include("~/Content/Styles/Administration/*.css", new CssRewriteUrlTransform()));
-
-            bundles.Add(GenerateCDNScriptBundle("~/Resources/JavaScript/Framework/Editor", "/Content/Scripts/Editor/QuickAccess.js", cdnRootAddress));
-            bundles.Add(GenerateCDNStyleBundle("~/Resources/CSS/Framework/Editor", "/Content/Styles/AppDrawers/app-drawers.css", cdnRootAddress));
-
-            bundles.Add(GenerateCDNScriptBundle("~/Plugins/Popover/Scripts/Editable", "/Content/Scripts/EditablePopover/editable.popover.js", cdnRootAddress));
-
-            bundles.Add(GenerateCDNScriptBundle("~/Resources/JavaScript/Plugins/FAQ", "/Content/Scripts/Components/component.expand.js", cdnRootAddress));
-            bundles.Add(GenerateCDNScriptBundle("~/Resources/JavaScript/Plugins/Pagination", "/Content/Scripts/Framework/pagination.js", cdnRootAddress));
-            bundles.Add(GenerateCDNScriptBundle("~/Resources/JavaScript/Plugins/Sliders", "/Content/Scripts/Administration/ThemeManager-Admin.js", cdnRootAddress));
-        }
-
-        private static void RegisterPlugins(BundleCollection bundles, string cdnRootAddress)
-        {
-            bundles.Add(new ScriptBundle("~/Plugins/JQuery/Scripts", "https://code.jquery.com/jquery-2.2.1.min.js").Include("~/Content/Plugins/JQuery/jquery-2.2.1.min.js"));
-            bundles.Add(GenerateCDNScriptBundle("~/Plugins/Touch/Scripts", "/Content/Plugins/JQueryUI/jquery.ui.touch-punch.min.js", cdnRootAddress));
-
-            bundles.Add(new ScriptBundle("~/Plugins/JQueryUI/Scripts", "https://code.jquery.com/ui/1.12.0-beta.1/jquery-ui.min.js").Include("~/Content/Plugins/JQueryUI/jquery.ui.min.js"));
-            bundles.Add(GenerateCDNStyleBundle("~/Plugins/JQueryUI/Styles", "/Content/Plugins/JQueryUI/jquery-ui.min.css", cdnRootAddress));
-
-            bundles.Add(new ScriptBundle("~/Plugins/Bootstrap/Scripts", "https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js").Include("~/Content/Plugins/Bootstrap/bootstrap.min.js"));
-            bundles.Add(new StyleBundle("~/Plugins/Bootstrap/Styles", "https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css").Include("~/Content/Plugins/Bootstrap/bootstrap.min.css", new CssRewriteUrlTransform()));
-
-            bundles.Add(GenerateCDNScriptBundle("~/Plugins/Popover/Scripts", "/Content/Scripts/Popover/initialise.js", cdnRootAddress));
-            bundles.Add(GenerateCDNScriptBundle("~/Plugins/Confirmation/Scripts", "/Content/Plugins/Confirmation/bootstrap-confirmation.min.js", cdnRootAddress));
-
-            bundles.Add(new ScriptBundle("~/Plugins/Spectrum/Scripts").Include("~/Content/Plugins/Spectrum/spectrum.min.js").Include("~/Content/Plugins/Spectrum/initialise.js"));
-            bundles.Add(GenerateCDNStyleBundle("~/Plugins/Spectrum/Styles", "/Content/Plugins/Spectrum/spectrum.css", cdnRootAddress));
-
-            bundles.Add(new ScriptBundle("~/Plugins/C3Graphing/Scripts").Include("~/Content/Plugins/C3Graphing/c3.min.js").Include("~/Content/Plugins/C3Graphing/d3.min.js"));
-            bundles.Add(GenerateCDNStyleBundle("~/Plugins/C3Graphing/Styles", "/Content/Plugins/C3Graphing/c3.min.css", cdnRootAddress));
-
-            bundles.Add(GenerateCDNScriptBundle("~/Plugins/FontAwesome/Scripts", "/Content/Plugins/FontAwesome/fontawesome-iconpicker.min.js", cdnRootAddress));
-            bundles.Add(GenerateCDNStyleBundle("~/Plugins/FontAwesome/Styles", "/Content/Plugins/FontAwesome/font-awesome.min.css", cdnRootAddress));
-            bundles.Add(GenerateCDNStyleBundle("~/Plugins/FontAwesome/Styles/Picker", "/Content/Plugins/FontAwesome/fontawesome-iconpicker.min.css", cdnRootAddress));
-
-            bundles.Add(new ScriptBundle("~/Plugins/FancyBox/Scripts").Include("~/Content/Plugins/FancyBox/jquery.fancybox.js").Include("~/Content/Plugins/FancyBox/jquery.fancybox-thumbs.js").Include("~/Content/Plugins/FancyBox/initialise.js"));
-            bundles.Add(new StyleBundle("~/Plugins/FancyBox/Styles").Include("~/Content/Plugins/FancyBox/*.css", new CssRewriteUrlTransform()));
-
-            bundles.Add(GenerateCDNStyleBundle("~/Plugins/HoverCSS/Styles", "/Content/Plugins/HoverCSS/hover-min.css", cdnRootAddress));
-            bundles.Add(GenerateCDNStyleBundle("~/Plugins/Animate/Styles", "/Content/Plugins/Animate/animate.min.css", cdnRootAddress));
-
-            bundles.Add(GenerateCDNScriptBundle("~/Plugins/ImageSelector/Scripts", "/Content/Plugins/ImageSelector/imageselector.js", cdnRootAddress));
-        }
-
-        private static Bundle GenerateCDNScriptBundle(string bundleName, string filePath, string cdnRootAddress)
-        {
-            if (string.IsNullOrEmpty(cdnRootAddress))
-            {
-                return new ScriptBundle(bundleName).Include($"~{filePath}");
-            }
-
-            return new ScriptBundle(bundleName, $"{cdnRootAddress}{filePath}").Include($"~{filePath}");
-        }
-
-        private static Bundle GenerateCDNStyleBundle(string bundleName, string filePath, string cdnRootAddress)
-        {
-            if (string.IsNullOrEmpty(cdnRootAddress))
-            {
-                return new StyleBundle(bundleName).Include($"~{filePath}");
-            }
-
-            var cdnFilePath = $"{cdnRootAddress}{filePath}";
-
-            return new StyleBundle(bundleName, $"{cdnRootAddress}{filePath}").Include($"~{filePath}");
-        }
-    }
-}
\ No newline at end of file
diff --git a/Portal.CMS.Web/Architecture/Helpers/EmailHelper.cs b/Portal.CMS.Web/Architecture/Helpers/EmailHelper.cs
deleted file mode 100644
index 193e59f..0000000
--- a/Portal.CMS.Web/Architecture/Helpers/EmailHelper.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using SendGrid;
-using SendGrid.Helpers.Mail;
-using System.Threading.Tasks;
-
-namespace Portal.CMS.Web.Architecture.Helpers
-{
-    public static class EmailHelper
-    {
-        const string WEBSITE_NAME = "Website Name";
-        const string EMAIL_FROM_ADDRESS = "Email From Address";
-        const string SENDGRID_API_KEY = "SendGrid ApiKey";
-
-        public static async Task SendEmailAsync(string recipientEmailAddress, string subject, string messageBody)
-        {
-            var apiKey = SettingHelper.Get(SENDGRID_API_KEY);
-            var client = new SendGridClient(apiKey);
-            var from = new EmailAddress(SettingHelper.Get(EMAIL_FROM_ADDRESS), SettingHelper.Get(WEBSITE_NAME));
-            var to = new EmailAddress(recipientEmailAddress);
-            var plainTextContent = messageBody;
-            var htmlContent = messageBody;
-            var msg = MailHelper.CreateSingleEmail(from, to, subject, plainTextContent, htmlContent);
-
-            await client.SendEmailAsync(msg);
-        }
-    }
-}
\ No newline at end of file
diff --git a/Portal.CMS.Web/Architecture/Helpers/MenuHelper.cs b/Portal.CMS.Web/Architecture/Helpers/MenuHelper.cs
deleted file mode 100644
index 453505b..0000000
--- a/Portal.CMS.Web/Architecture/Helpers/MenuHelper.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-using Portal.CMS.Entities.Entities;
-using Portal.CMS.Services.Menu;
-using Portal.CMS.Web.DependencyResolution;
-using System.Collections.Generic;
-
-namespace Portal.CMS.Web.Architecture.Helpers
-{
-    public static class MenuHelper
-    {
-        public static List<MenuItem> Get(string menuName)
-        {
-            var validSession = System.Web.HttpContext.Current.Session != null;
-
-            object sessionMenu = null;
-
-            if (validSession)
-            {
-                sessionMenu = System.Web.HttpContext.Current.Session[$"Menu-{menuName}"];
-            }
-
-            if (sessionMenu != null)
-            {
-                return (List<MenuItem>)sessionMenu;
-            }
-            else
-            {
-                var container = IoC.Initialize();
-
-                IMenuService menuService = container.GetInstance<MenuService>();
-
-                var menuItems = AsyncHelpers.RunSync(() => menuService.ViewAsync(UserHelper.UserId, menuName));
-
-                if (validSession)
-                {
-                    System.Web.HttpContext.Current.Session.Add($"Menu-{menuName}", menuItems);
-                }
-
-                return menuItems;
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/Portal.CMS.Web/Architecture/Helpers/SettingHelper.cs b/Portal.CMS.Web/Architecture/Helpers/SettingHelper.cs
deleted file mode 100644
index b46c85d..0000000
--- a/Portal.CMS.Web/Architecture/Helpers/SettingHelper.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-using Portal.CMS.Services.Settings;
-using Portal.CMS.Web.DependencyResolution;
-
-namespace Portal.CMS.Web.Architecture.Helpers
-{
-    public static class SettingHelper
-    {
-        public static string Get(string settingName)
-        {
-            var validSession = System.Web.HttpContext.Current.Session != null;
-
-            object sessionSetting = null;
-
-            if (validSession)
-            {
-                sessionSetting = System.Web.HttpContext.Current.Session[$"Setting-{settingName}"];
-            }
-
-            if (sessionSetting != null)
-            {
-                return sessionSetting.ToString();
-            }
-            else
-            {
-                var container = IoC.Initialize();
-
-                var settingService = container.GetInstance<SettingService>();
-
-                var setting = AsyncHelpers.RunSync(() => settingService.GetAsync(settingName));
-
-                if (setting == null)
-                    return string.Empty;
-
-                if (validSession)
-                {
-                    System.Web.HttpContext.Current.Session.Add($"Setting-{settingName}", setting.SettingValue);
-                }
-
-                return setting.SettingValue;
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/Portal.CMS.Web/Architecture/Helpers/UserHelper.cs b/Portal.CMS.Web/Architecture/Helpers/UserHelper.cs
deleted file mode 100644
index 0859d5d..0000000
--- a/Portal.CMS.Web/Architecture/Helpers/UserHelper.cs
+++ /dev/null
@@ -1,135 +0,0 @@
-using Portal.CMS.Entities.Entities;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace Portal.CMS.Web.Architecture.Helpers
-{
-    public static class UserHelper
-    {
-        const string USER_ACCOUNT = "UserAccount";
-        const string USER_ROLES = "UserRoles";
-        const string ADMIN_ROLE = "Admin";
-        const string EDITOR_ROLE = "Editor";
-
-        public static bool IsLoggedIn
-        {
-            get
-            {
-                if (System.Web.HttpContext.Current.Session[USER_ACCOUNT] == null)
-                    return false;
-
-                return true;
-            }
-        }
-
-        public static bool IsAdmin
-        {
-            get
-            {
-                var userSession = (User)System.Web.HttpContext.Current.Session[USER_ACCOUNT];
-                var userRoles = (IEnumerable<Role>)System.Web.HttpContext.Current.Session[USER_ROLES];
-
-                if (userSession == null || userRoles == null)
-                    return false;
-
-                if (userRoles.Any(x => x.RoleName.Equals(ADMIN_ROLE, System.StringComparison.OrdinalIgnoreCase)))
-                    return true;
-
-                return false;
-            }
-        }
-
-        public static bool IsEditor
-        {
-            get
-            {
-                var userSession = (User)System.Web.HttpContext.Current.Session[USER_ACCOUNT];
-                var userRoles = (IEnumerable<Role>)System.Web.HttpContext.Current.Session[USER_ROLES];
-
-                if (userSession == null || userRoles == null)
-                    return false;
-
-                if (userRoles.Any(x => x.RoleName == EDITOR_ROLE) || userRoles.Any(x => x.RoleName == ADMIN_ROLE))
-                    return true;
-
-                return false;
-            }
-        }
-
-        public static int? UserId
-        {
-            get
-            {
-                var userAccount = (User)System.Web.HttpContext.Current.Session[USER_ACCOUNT];
-
-                if (userAccount == null)
-                    return null;
-
-                return userAccount.UserId;
-            }
-        }
-
-        public static string AvatarImagePath
-        {
-            get
-            {
-                var userAccount = (User)System.Web.HttpContext.Current.Session[USER_ACCOUNT];
-
-                return userAccount.AvatarImagePath;
-            }
-        }
-
-        public static string FullName
-        {
-            get
-            {
-                var userAccount = (User)System.Web.HttpContext.Current.Session[USER_ACCOUNT];
-
-                return $"{userAccount.GivenName} {userAccount.FamilyName}";
-            }
-        }
-
-        public static string GivenName
-        {
-            get
-            {
-                var userAccount = (User)System.Web.HttpContext.Current.Session[USER_ACCOUNT];
-
-                return userAccount.GivenName;
-            }
-        }
-
-        public static string FamilyName
-        {
-            get
-            {
-                var userAccount = (User)System.Web.HttpContext.Current.Session[USER_ACCOUNT];
-
-                return userAccount.FamilyName;
-            }
-        }
-
-        public static string EmailAddress
-        {
-            get
-            {
-                var userAccount = (User)System.Web.HttpContext.Current.Session[USER_ACCOUNT];
-
-                return userAccount.EmailAddress;
-            }
-        }
-
-        public static string Bio
-        {
-            get
-            {
-                var userAccount = (User)System.Web.HttpContext.Current.Session[USER_ACCOUNT];
-
-                if (string.IsNullOrWhiteSpace(userAccount.Bio))
-                    return "You haven't written a Bio yet...";
-
-                return userAccount.Bio;
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/Portal.CMS.Web/Areas/Admin/Controllers/PageManagerController.cs b/Portal.CMS.Web/Areas/Admin/Controllers/PageManagerController.cs
deleted file mode 100644
index 24ec702..0000000
--- a/Portal.CMS.Web/Areas/Admin/Controllers/PageManagerController.cs
+++ /dev/null
@@ -1,158 +0,0 @@
-using Portal.CMS.Entities.Enumerators;
-using Portal.CMS.Services.Authentication;
-using Portal.CMS.Services.PageBuilder;
-using Portal.CMS.Web.Architecture.ActionFilters;
-using Portal.CMS.Web.Architecture.Helpers;
-using Portal.CMS.Web.Areas.Admin.ViewModels.PageManager;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using System.Web;
-using System.Web.Mvc;
-
-namespace Portal.CMS.Web.Areas.Admin.Controllers
-{
-    [AdminFilter(ActionFilterResponseType.Page)]
-    public class PageManagerController : Controller
-    {
-        #region Dependencies
-
-        private readonly IPageService _pageService;
-        private readonly IRoleService _roleService;
-        private readonly ITokenService _tokenService;
-
-        public PageManagerController(IPageService pageService, IRoleService roleService, ITokenService tokenService)
-        {
-            _pageService = pageService;
-            _roleService = roleService;
-            _tokenService = tokenService;
-        }
-
-        #endregion Dependencies
-
-        [HttpGet]
-        public async Task<ActionResult> Index()
-        {
-            var model = new PagesViewModel
-            {
-                PageList = await _pageService.GetAsync(),
-                PageAreas = new List<string>()
-            };
-
-            foreach (var pageArea in model.PageList.GroupBy(x => x.PageArea))
-            {
-                if (pageArea.Key == null)
-                    continue;
-
-                model.PageAreas.Add(pageArea.Key);
-            }
-
-            return View(model);
-        }
-
-        [HttpGet]
-        public async Task<ActionResult> Create()
-        {
-            var model = new CreateViewModel
-            {
-                RoleList = await _roleService.GetAsync()
-            };
-
-            return View("_Create", model);
-        }
-
-        [HttpPost]
-        [ValidateInput(false)]
-        [ValidateAntiForgeryToken]
-        public async Task<ActionResult> Create(CreateViewModel model)
-        {
-            if (!ModelState.IsValid)
-            {
-                model.RoleList = await _roleService.GetAsync();
-                return View("_Create", model);
-            }
-
-            var pageId = await _pageService.AddAsync(model.PageName, model.PageArea, model.PageController, model.PageAction);
-
-            await _pageService.RolesAsync(pageId, model.SelectedRoleList);
-
-            var token = await _tokenService.AddAsync(UserHelper.EmailAddress, UserTokenType.SSO);
-
-            var cookie = new HttpCookie("PortalCMS_SSO", string.Join(",", UserHelper.UserId, HttpContext.Request.Url.AbsoluteUri, token))
-            {
-                Expires = DateTime.Now.AddMinutes(5)
-            };
-
-            ControllerContext.HttpContext.Response.Cookies.Add(cookie);
-
-            HttpRuntime.UnloadAppDomain();
-
-            return Content("SSO");
-        }
-
-        [HttpGet]
-        public async Task<ActionResult> Edit(int pageId)
-        {
-            var page = await _pageService.GetAsync(pageId);
-
-            var model = new EditViewModel
-            {
-                PageId = page.PageId,
-                PageName = page.PageName,
-                PageArea = page.PageArea,
-                PageController = page.PageController,
-                PageAction = page.PageAction,
-                RoleList = await _roleService.GetAsync(),
-                SelectedRoleList = page.PageRoles.Select(x => x.Role.RoleName).ToList()
-            };
-
-            return View("_Edit", model);
-        }
-
-        [HttpPost]
-        [ValidateInput(false)]
-        [ValidateAntiForgeryToken]
-        public async Task<ActionResult> Edit(EditViewModel model)
-        {
-            var page = await _pageService.GetAsync(model.PageId);
-
-            var restartRequired = false || (!string.IsNullOrWhiteSpace(page.PageArea).Equals(string.IsNullOrWhiteSpace(model.PageArea)) || !page.PageController.Equals(model.PageController) || !page.PageAction.Equals(model.PageAction));
-
-            if (!ModelState.IsValid)
-            {
-                model.RoleList = await _roleService.GetAsync();
-                return View("_Edit", model);
-            }
-
-            await _pageService.EditAsync(model.PageId, model.PageName, model.PageArea, model.PageController, model.PageAction);
-
-            await _pageService.RolesAsync(model.PageId, model.SelectedRoleList);
-
-            // RESET: Routing by Starting the Website.
-            if (restartRequired)
-                HttpRuntime.UnloadAppDomain();
-
-            return Content("Refresh");
-        }
-
-        [HttpGet]
-        public async Task<ActionResult> Delete(int pageId)
-        {
-            await _pageService.DeleteAsync(pageId);
-
-            return RedirectToAction(nameof(Index));
-        }
-
-        [HttpGet]
-        public async Task<ActionResult> AppDrawer()
-        {
-            var model = new AppDrawerViewModel
-            {
-                PageList = await _pageService.GetAsync()
-            };
-
-            return PartialView("_AppDrawer", model);
-        }
-    }
-}
\ No newline at end of file
diff --git a/Portal.CMS.Web/Areas/Admin/Controllers/RoleManagerController.cs b/Portal.CMS.Web/Areas/Admin/Controllers/RoleManagerController.cs
deleted file mode 100644
index aa3c908..0000000
--- a/Portal.CMS.Web/Areas/Admin/Controllers/RoleManagerController.cs
+++ /dev/null
@@ -1,83 +0,0 @@
-using Portal.CMS.Services.Authentication;
-using Portal.CMS.Web.Architecture.ActionFilters;
-using Portal.CMS.Web.Areas.Admin.ViewModels.RoleManager;
-using System.Threading.Tasks;
-using System.Web.Mvc;
-
-namespace Portal.CMS.Web.Areas.Admin.Controllers
-{
-    [AdminFilter(ActionFilterResponseType.Page)]
-    public class RoleManagerController : Controller
-    {
-        #region Dependencies
-
-        private readonly IRoleService _roleService;
-
-        public RoleManagerController(IRoleService roleService)
-        {
-            _roleService = roleService;
-        }
-
-        #endregion Dependencies
-
-        [HttpGet]
-        public ActionResult Index()
-        {
-            return RedirectToAction(nameof(Index), "SettingManager");
-        }
-
-        [HttpGet]
-        public ActionResult Create()
-        {
-            var model = new CreateViewModel();
-
-            return View("_Create", model);
-        }
-
-        [HttpPost]
-        [ValidateAntiForgeryToken]
-        public async Task<ActionResult> Create(CreateViewModel model)
-        {
-            if (!ModelState.IsValid)
-                return View("_Create", model);
-
-            await _roleService.AddAsync(model.RoleName);
-
-            return Content("Refresh");
-        }
-
-        [HttpGet]
-        public async Task<ActionResult> Edit(int roleId)
-        {
-            var role = await _roleService.GetAsync(roleId);
-
-            var model = new EditViewModel
-            {
-                RoleId = role.RoleId,
-                RoleName = role.RoleName
-            };
-
-            return View("_Edit", model);
-        }
-
-        [HttpPost]
-        [ValidateAntiForgeryToken]
-        public async Task<ActionResult> Edit(EditViewModel model)
-        {
-            if (!ModelState.IsValid)
-                return View("_Edit", model);
-
-            await _roleService.EditAsync(model.RoleId, model.RoleName);
-
-            return Content("Refresh");
-        }
-
-        [HttpGet]
-        public async Task<ActionResult> Delete(int roleId)
-        {
-            await _roleService.DeleteAsync(roleId);
-
-            return RedirectToAction(nameof(Index), "SettingManager");
-        }
-    }
-}
\ No newline at end of file
diff --git a/Portal.CMS.Web/Areas/Admin/Controllers/SettingManagerController.cs b/Portal.CMS.Web/Areas/Admin/Controllers/SettingManagerController.cs
deleted file mode 100644
index 8646c11..0000000
--- a/Portal.CMS.Web/Areas/Admin/Controllers/SettingManagerController.cs
+++ /dev/null
@@ -1,70 +0,0 @@
-using Portal.CMS.Services.Settings;
-using Portal.CMS.Web.Architecture.ActionFilters;
-using Portal.CMS.Web.Architecture.Helpers;
-using Portal.CMS.Web.Areas.Admin.ViewModels.SettingManager;
-using System.Threading.Tasks;
-using System.Web.Mvc;
-
-namespace Portal.CMS.Web.Areas.Admin.Controllers
-{
-    [AdminFilter(ActionFilterResponseType.Page)]
-    public class SettingManagerController : Controller
-    {
-        #region Dependencies
-
-        private readonly ISettingService _settingService;
-
-        public SettingManagerController(ISettingService settingService)
-        {
-            _settingService = settingService;
-        }
-
-        #endregion Dependencies
-
-        [HttpGet]
-        public ActionResult Setup()
-        {
-            var model = new SetupViewModel
-            {
-                WebsiteName = SettingHelper.Get("Website Name"),
-                WebsiteDescription = SettingHelper.Get("Description Meta Tag"),
-                GoogleAnalyticsId = SettingHelper.Get("Google Analytics Tracking ID"),
-                EmailFromAddress = SettingHelper.Get("Email From Address"),
-                SendGridApiKey = SettingHelper.Get("SendGrid ApiKey"),
-                CDNAddress = SettingHelper.Get("CDN Address")
-            };
-
-            if (string.IsNullOrWhiteSpace(model.EmailFromAddress))
-                model.EmailFromAddress = UserHelper.EmailAddress;
-
-            return View("_Setup", model);
-        }
-
-        [HttpPost]
-        public async Task<ActionResult> Setup(SetupViewModel model)
-        {
-            if (!ModelState.IsValid)
-                return View("_Setup", model);
-
-            await _settingService.EditAsync("Website Name", model.WebsiteName);
-            Session.Remove("Setting-Website Name");
-
-            await _settingService.EditAsync("Description Meta Tag", model.WebsiteDescription);
-            Session.Remove("Setting-Description Meta Tag");
-
-            await _settingService.EditAsync("Google Analytics Tracking ID", model.GoogleAnalyticsId);
-            Session.Remove("Setting-Google Analytics Tracking ID");
-
-            await _settingService.EditAsync("Email From Address", model.EmailFromAddress);
-            Session.Remove("Setting-Email From Address");
-
-            await _settingService.EditAsync("SendGrid ApiKey", model.SendGridApiKey);
-            Session.Remove("Setting-SendGrid ApiKey");
-
-            await _settingService.EditAsync("CDN Address", model.CDNAddress);
-            Session.Remove("Setting-CDN Address");
-
-            return Content("Refresh");
-        }
-    }
-}
\ No newline at end of file
diff --git a/Portal.CMS.Web/Areas/Admin/Controllers/UserManagerController.cs b/Portal.CMS.Web/Areas/Admin/Controllers/UserManagerController.cs
deleted file mode 100644
index 6d818b1..0000000
--- a/Portal.CMS.Web/Areas/Admin/Controllers/UserManagerController.cs
+++ /dev/null
@@ -1,156 +0,0 @@
-using Portal.CMS.Services.Authentication;
-using Portal.CMS.Web.Architecture.ActionFilters;
-using Portal.CMS.Web.Architecture.Helpers;
-using Portal.CMS.Web.Areas.Admin.ViewModels.UserManager;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using System.Web.Mvc;
-
-namespace Portal.CMS.Web.Areas.Admin.Controllers
-{
-    [AdminFilter(ActionFilterResponseType.Page)]
-    public class UserManagerController : Controller
-    {
-        #region Dependencies
-
-        private readonly IUserService _userService;
-        private readonly IRegistrationService _registrationService;
-        private readonly IRoleService _roleService;
-
-        public UserManagerController(IUserService userService, IRegistrationService registrationService, IRoleService roleService)
-        {
-            _userService = userService;
-            _registrationService = registrationService;
-            _roleService = roleService;
-        }
-
-        #endregion Dependencies
-
-        [HttpGet]
-        public async Task<ActionResult> Index()
-        {
-            var model = new UsersViewModel
-            {
-                Users = await _userService.GetAsync()
-            };
-
-            return View(model);
-        }
-
-        [HttpGet]
-        public ActionResult Create()
-        {
-            return View("_Create", new CreateViewModel());
-        }
-
-        [HttpPost]
-        [ValidateAntiForgeryToken]
-        public async Task<ActionResult> Create(CreateViewModel model)
-        {
-            if (!ModelState.IsValid)
-                return View("_Create", model);
-
-            var userId = await _registrationService.RegisterAsync(model.EmailAddress, model.Password, model.GivenName, model.FamilyName);
-
-            switch (userId.Value)
-            {
-                case -1:
-                    ModelState.AddModelError("EmailAddressUsed", "The Email Address you entered is already registered");
-                    return View("_Create", model);
-
-                default:
-                    if (await _userService.GetUserCountAsync() == 1)
-                        await _roleService.UpdateAsync(userId.Value, new List<string> { nameof(Admin) });
-                    else
-                        await _roleService.UpdateAsync(userId.Value, new List<string> { "Authenticated" });
-
-                    if (!UserHelper.IsLoggedIn)
-                        Session.Add("UserAccount", await _userService.GetUserAsync(userId.Value));
-
-                    return Content("Refresh");
-            }
-        }
-
-        [HttpGet]
-        public async Task<ActionResult> Details(int userId)
-        {
-            var user = await _userService.GetUserAsync(userId);
-
-            var model = new DetailsViewModel
-            {
-                UserId = userId,
-                EmailAddress = user.EmailAddress,
-                GivenName = user.GivenName,
-                FamilyName = user.FamilyName,
-                DateAdded = user.DateAdded,
-                DateUpdated = user.DateUpdated
-            };
-
-            return View("_Details", model);
-        }
-
-        [HttpPost]
-        public async Task<ActionResult> Details(DetailsViewModel model)
-        {
-            if (!ModelState.IsValid)
-                return View("_Details", model);
-
-            await _userService.UpdateDetailsAsync(model.UserId, model.EmailAddress, model.GivenName, model.FamilyName);
-
-            if (model.UserId == UserHelper.UserId)
-            {
-                Session.Remove("UserAccount");
-
-                Session.Add("UserAccount", await _userService.GetUserAsync(model.UserId));
-            }
-
-            return Content("Refresh");
-        }
-
-        [HttpGet]
-        public async Task<ActionResult> Roles(int? userId)
-        {
-            var model = new RolesViewModel
-            {
-                UserId = userId.Value,
-                RoleList = await _roleService.GetUserAssignableRolesAsync()
-            };
-
-            var userRoles = await _roleService.GetAsync(userId);
-
-            foreach (var role in userRoles)
-                model.SelectedRoleList.Add(role.RoleName);
-
-            return PartialView("_Roles", model);
-        }
-
-        [HttpPost]
-        [ValidateAntiForgeryToken]
-        public async Task<ActionResult> Roles(RolesViewModel model)
-        {
-            if (!ModelState.IsValid)
-                return View("_Roles", model);
-
-            await _roleService.UpdateAsync(model.UserId.Value, model.SelectedRoleList);
-
-            if (model.UserId == UserHelper.UserId)
-            {
-                Session.Remove("UserAccount");
-                Session.Remove("UserRoles");
-
-                Session.Add("UserAccount", await _userService.GetUserAsync(model.UserId.Value));
-                Session.Add("UserRoles", await _roleService.GetAsync(model.UserId));
-            }
-
-            return Content("Refresh");
-        }
-
-        [HttpGet]
-        public async Task<ActionResult> Delete(int userId)
-        {
-            await _userService.DeleteUserAsync(userId);
-
-            return RedirectToAction(nameof(Index));
-        }
-    }
-}
\ No newline at end of file
diff --git a/Portal.CMS.Web/Areas/Admin/ViewModels/SettingManager/SetupViewModel.cs b/Portal.CMS.Web/Areas/Admin/ViewModels/SettingManager/SetupViewModel.cs
deleted file mode 100644
index 28bf8fd..0000000
--- a/Portal.CMS.Web/Areas/Admin/ViewModels/SettingManager/SetupViewModel.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using System.ComponentModel;
-using System.ComponentModel.DataAnnotations;
-
-namespace Portal.CMS.Web.Areas.Admin.ViewModels.SettingManager
-{
-    public class SetupViewModel
-    {
-        [Required]
-        [DisplayName("Website Name")]
-        public string WebsiteName { get; set; }
-
-        [Required]
-        [DisplayName("Website Description")]
-        public string WebsiteDescription { get; set; }
-
-        [DisplayName("Google Tracking Code")]
-        public string GoogleAnalyticsId { get; set; }
-
-        [DisplayName("Email From Address")]
-        public string EmailFromAddress { get; set; }
-
-        [DisplayName("SendGrid API Key")]
-        public string SendGridApiKey { get; set; }
-
-        [DisplayName("CDN Address")]
-        public string CDNAddress { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/Portal.CMS.Web/Areas/Admin/ViewModels/UserManager/DeleteViewModel.cs b/Portal.CMS.Web/Areas/Admin/ViewModels/UserManager/DeleteViewModel.cs
deleted file mode 100644
index 57c30ce..0000000
--- a/Portal.CMS.Web/Areas/Admin/ViewModels/UserManager/DeleteViewModel.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace Portal.CMS.Web.Areas.Admin.ViewModels.UserManager
-{
-    public class DeleteViewModel
-    {
-        public int UserId { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/Portal.CMS.Web/Areas/Admin/ViewModels/UserManager/DetailsViewModel.cs b/Portal.CMS.Web/Areas/Admin/ViewModels/UserManager/DetailsViewModel.cs
deleted file mode 100644
index 58eaadd..0000000
--- a/Portal.CMS.Web/Areas/Admin/ViewModels/UserManager/DetailsViewModel.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using System;
-using System.ComponentModel;
-using System.ComponentModel.DataAnnotations;
-
-namespace Portal.CMS.Web.Areas.Admin.ViewModels.UserManager
-{
-    public class DetailsViewModel
-    {
-        public int UserId { get; set; }
-
-        [DisplayName("Email")]
-        [Required]
-        public string EmailAddress { get; set; }
-
-        [DisplayName("First Name")]
-        [Required]
-        public string GivenName { get; set; }
-
-        [DisplayName("Last Name")]
-        [Required]
-        public string FamilyName { get; set; }
-
-        public DateTime DateAdded { get; set; }
-
-        public DateTime DateUpdated { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/Portal.CMS.Web/Areas/Admin/ViewModels/UserManager/RolesViewModel.cs b/Portal.CMS.Web/Areas/Admin/ViewModels/UserManager/RolesViewModel.cs
deleted file mode 100644
index ec64ac4..0000000
--- a/Portal.CMS.Web/Areas/Admin/ViewModels/UserManager/RolesViewModel.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using Portal.CMS.Entities.Entities;
-using System.Collections.Generic;
-using System.ComponentModel;
-
-namespace Portal.CMS.Web.Areas.Admin.ViewModels.UserManager
-{
-    public class RolesViewModel
-    {
-        public int? UserId { get; set; }
-
-        [DisplayName("Roles")]
-        public List<string> SelectedRoleList { get; set; } = new List<string>();
-
-        public List<Role> RoleList { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/Portal.CMS.Web/Areas/Admin/ViewModels/UserManager/UsersViewModel.cs b/Portal.CMS.Web/Areas/Admin/ViewModels/UserManager/UsersViewModel.cs
deleted file mode 100644
index 2c14f58..0000000
--- a/Portal.CMS.Web/Areas/Admin/ViewModels/UserManager/UsersViewModel.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using Portal.CMS.Entities.Entities;
-using System.Collections.Generic;
-
-namespace Portal.CMS.Web.Areas.Admin.ViewModels.UserManager
-{
-    public class UsersViewModel
-    {
-        public IEnumerable<User> Users { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/Portal.CMS.Web/Areas/Admin/Views/SettingManager/_Setup.cshtml b/Portal.CMS.Web/Areas/Admin/Views/SettingManager/_Setup.cshtml
deleted file mode 100644
index 1537902..0000000
--- a/Portal.CMS.Web/Areas/Admin/Views/SettingManager/_Setup.cshtml
+++ /dev/null
@@ -1,88 +0,0 @@
-@model Portal.CMS.Web.Areas.Admin.ViewModels.SettingManager.SetupViewModel
-@{
-    Layout = "";
-}
-
-<style>
-    .control-group label
-    {
-        width: 190px;
-    }
-
-    .control-group input
-    {
-        width: calc(100% - 190px);
-    }
-</style>
-
-@using (Html.BeginForm("Setup", "SettingManager", FormMethod.Post))
-{
-    @Html.AntiForgeryToken()
-
-    <ul class="nav nav-tabs">
-        <li role="presentation" class="active"><a href="#tab-general" aria-controls="tab-general" role="tab" data-toggle="tab">General</a></li>
-        <li role="presentation" class=""><a href="#tab-email" aria-controls="tab-email" role="tab" data-toggle="tab">Email</a></li>
-        <li role="presentation" class=""><a href="#tab-analytics" aria-controls="tab-analytics" role="tab" data-toggle="tab">Analytics</a></li>
-        <li role="presentation" class=""><a href="#tab-cdn" aria-controls="tab-cdn" role="tab" data-toggle="tab">CDN</a></li>
-    </ul>
-
-    <div class="tab-content">
-        <div role="tabpanel" class="tab-pane active" id="tab-general">
-            <h4>Welcome to Portal CMS</h4>
-            <p>There are a few small details you may wish to configure now to get your site setup.</p>
-
-            <br />
-            <div class="alert alert-warning" role="alert">The information on this tab is displayed in search results.</div>
-
-            @Html.ValidationMessage("WebsiteName")
-            <div class="control-group">
-                @Html.LabelFor(x => x.WebsiteName)
-                @Html.TextBoxFor(x => x.WebsiteName)
-            </div>
-
-            <div class="control-group control-textarea float-container">
-                @Html.LabelFor(x => x.WebsiteDescription)
-                @Html.TextAreaFor(x => x.WebsiteDescription)
-            </div>
-        </div>
-        <div role="tabpanel" class="tab-pane" id="tab-email">
-            <h4>SendGrid Email Delivery</h4>
-            <p>SendGrid is a reliable and easy to use method of email delivery, You can send 12,000 emails for free every month. <a href="https://sendgrid.com/" target="_blank">Learn More about SendGrid.</a></p>
-            <br />
-            <div class="alert alert-warning" role="alert">When you configure email settings, users can request a forgotten password email token.</div>
-            <div class="control-group">
-                @Html.LabelFor(x => x.EmailFromAddress)
-                @Html.TextBoxFor(x => x.EmailFromAddress)
-            </div>
-            <div class="control-group">
-                @Html.LabelFor(x => x.SendGridApiKey)
-                @Html.TextBoxFor(x => x.SendGridApiKey)
-            </div>
-        </div>
-        <div role="tabpanel" class="tab-pane" id="tab-analytics">
-            <h4>Google Analytics Integration</h4>
-            <p>Portal CMS collects its own Analytics to give you real time and useful information about how your website is being used. You can also configure Portal CMS to use Google Analytics.</p>
-            <br />
-            <div class="alert alert-warning" role="alert">When you submit your Google Analytics Tracking Code, we will start pushing data to your Analytics account.</div>
-            <div class="control-group">
-                @Html.LabelFor(x => x.GoogleAnalyticsId)
-                @Html.TextBoxFor(x => x.GoogleAnalyticsId)
-            </div>
-        </div>
-        <div role="tabpanel" class="tab-pane" id="tab-cdn">
-            <h4>Content Delivery Network</h4>
-            <p>Portal CMS can utilise a Content Delivery Network that is setup to cache the content of your website. When configured Portal CMS will load your Uploaded Images from the CDN.</p>
-            <br />
-            <div class="alert alert-warning" role="alert">Please enter your CDN Address below. For example: http://cdn.portalcms.online</div>
-            <div class="control-group">
-                @Html.LabelFor(x => x.CDNAddress)
-                @Html.TextBoxFor(x => x.CDNAddress)
-            </div>
-        </div>
-    </div>
-
-    <div class="footer">
-        <button class="btn primary">Save</button>
-        <button class="btn" data-dismiss="modal">Cancel</button>
-    </div>
-}
\ No newline at end of file
diff --git a/Portal.CMS.Web/Areas/Admin/Views/UserManager/Index.cshtml b/Portal.CMS.Web/Areas/Admin/Views/UserManager/Index.cshtml
deleted file mode 100644
index 1ca5a0e..0000000
--- a/Portal.CMS.Web/Areas/Admin/Views/UserManager/Index.cshtml
+++ /dev/null
@@ -1,43 +0,0 @@
-@model Portal.CMS.Web.Areas.Admin.ViewModels.UserManager.UsersViewModel
-@{
-    ViewBag.Title = "User Manager";
-    ViewBag.Icon = "/Areas/Admin/Content/Images/icon-users.png";
-}
-
-@Html.Action("Render", "QuickAccess", new { area = "Admin", pageType = QuickAccessPageType.UserManagement_Admin })
-
-<div class="row">
-    @foreach (var user in Model.Users)
-    {
-        <div class="col-xs-12 col-md-6 col-lg-4">
-            <div class="box float-container">
-
-                <div class="row" style="height: 120px;">
-                    <div class="col-xs-3 vertical-alignment">
-                        <img src="@user.AvatarImagePath" class="avatar" alt="User Avatar" style="border-radius: 50%;" />
-                    </div>
-                    <div class="col-xs-9 vertical-alignment" style="text-align: left; padding-left: 40px;">
-                        <h3>@user.GivenName @user.FamilyName</h3>
-                        <p>@user.EmailAddress</p>
-                    </div>
-                </div>
-
-                @if (user.UserId == UserHelper.UserId)
-                {
-                    <div class="admin-container x2">
-                        <a href="@Url.Action("Details", "UserManager", new { userId = @user.UserId })" class="admin-item launch-modal" data-title="Edit Details"><span class="fa fa-pencil"></span>Details</a>
-                        <a href="@Url.Action("Roles", "UserManager", new { userId = @user.UserId })" class="admin-item launch-modal" data-title="Edit Roles"><span class="fa fa-building"></span>Roles</a>
-                    </div>
-                }
-                else
-                {
-                    <div class="admin-container x3">
-                        <a href="@Url.Action("Details", "UserManager", new { userId = @user.UserId })" class="admin-item launch-modal" data-title="Edit Details"><span class="fa fa-pencil"></span>Details</a>
-                        <a href="@Url.Action("Roles", "UserManager", new { userId = @user.UserId })" class="admin-item launch-modal" data-title="Edit Roles"><span class="fa fa-building"></span>Roles</a>
-                        <a href="@Url.Action("Delete", "UserManager", new { userId = @user.UserId })" class="admin-item" data-toggle="confirmation" data-placement="top" data-container="body"><span class="fa fa-trash"></span>Delete</a>
-                    </div>
-                }
-            </div>
-        </div>
-    }
-</div>
\ No newline at end of file
diff --git a/Portal.CMS.Web/Areas/Authentication/Controllers/LoginController.cs b/Portal.CMS.Web/Areas/Authentication/Controllers/LoginController.cs
deleted file mode 100644
index 122137f..0000000
--- a/Portal.CMS.Web/Areas/Authentication/Controllers/LoginController.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-using Portal.CMS.Services.Authentication;
-using Portal.CMS.Web.Areas.Authentication.ViewModels.Login;
-using System.Threading.Tasks;
-using System.Web.Mvc;
-
-namespace Portal.CMS.Web.Areas.Authentication.Controllers
-{
-    public class LoginController : Controller
-    {
-        private readonly ILoginService _loginService;
-        private readonly IUserService _userService;
-        private readonly IRoleService _roleService;
-
-        public LoginController(ILoginService loginService, IUserService userService, IRoleService roleService)
-        {
-            _loginService = loginService;
-            _userService = userService;
-            _roleService = roleService;
-        }
-
-        [HttpGet]
-        [OutputCache(Duration = 86400)]
-        public ActionResult Index()
-        {
-            return View("_LoginForm", new LoginViewModel());
-        }
-
-        [HttpPost]
-        [ValidateAntiForgeryToken]
-        public async Task<ActionResult> Login(LoginViewModel model)
-        {
-            if (!ModelState.IsValid)
-                return View("_LoginForm", model);
-
-            var userId = await _loginService.LoginAsync(model.EmailAddress, model.Password);
-
-            if (!userId.HasValue)
-            {
-                ModelState.AddModelError("InvalidCredentials", "Invalid Account Credentials");
-
-                return View("_LoginForm", model);
-            }
-
-            Session.Add("UserAccount", await _userService.GetUserAsync(userId.Value));
-            Session.Add("UserRoles", await _roleService.GetAsync(userId));
-
-            return Content("Refresh");
-        }
-
-        [HttpGet]
-        public ActionResult Logout()
-        {
-            Session.Clear();
-
-            return RedirectToAction("Index", "Home", new { area = "" });
-        }
-    }
-}
\ No newline at end of file
diff --git a/Portal.CMS.Web/Areas/Authentication/Controllers/RecoveryController.cs b/Portal.CMS.Web/Areas/Authentication/Controllers/RecoveryController.cs
deleted file mode 100644
index a9067f4..0000000
--- a/Portal.CMS.Web/Areas/Authentication/Controllers/RecoveryController.cs
+++ /dev/null
@@ -1,70 +0,0 @@
-using Portal.CMS.Entities.Enumerators;
-using Portal.CMS.Services.Authentication;
-using Portal.CMS.Web.Architecture.Helpers;
-using Portal.CMS.Web.Areas.Authentication.ViewModels.Login;
-using Portal.CMS.Web.Areas.Authentication.ViewModels.Recovery;
-using System;
-using System.Threading.Tasks;
-using System.Web.Mvc;
-
-namespace Portal.CMS.Web.Areas.Authentication.Controllers
-{
-    public class RecoveryController : Controller
-    {
-        private readonly ITokenService _tokenService;
-
-        public RecoveryController(ITokenService tokenService)
-        {
-            _tokenService = tokenService;
-        }
-
-        [HttpPost]
-        [ValidateAntiForgeryToken]
-        public async Task<ActionResult> Forgot(LoginViewModel model)
-        {
-            var token = await _tokenService.AddAsync(model.EmailAddress, UserTokenType.ForgottenPassword);
-
-            if (!string.IsNullOrWhiteSpace(token))
-            {
-                var websiteName = SettingHelper.Get("Website Name");
-
-                var recoveryLink = $@"http://{System.Web.HttpContext.Current.Request.Url.Authority}{Url.Action(nameof(Reset), "Recovery", new { area = "Authentication", id = token })}";
-
-                await EmailHelper.SendEmailAsync(model.EmailAddress, "Password Reset", $"<p>You submitted a request on {websiteName} for assistance in resetting your password. To change your password please click on the link below and complete the requested information.</p><a href=\"{recoveryLink}\">Recover Account</a>");
-            }
-
-            return Content("Refresh");
-        }
-
-        [HttpGet]
-        public ActionResult Reset(string id)
-        {
-            return View(new ResetViewModel { Token = id });
-        }
-
-        [HttpPost]
-        [ValidateAntiForgeryToken]
-        public async Task<ActionResult> Reset(ResetViewModel model)
-        {
-            if (!string.IsNullOrWhiteSpace(model.Password) && !string.IsNullOrWhiteSpace(model.ConfirmPassword))
-            {
-                if (!model.Password.Equals(model.ConfirmPassword, StringComparison.Ordinal))
-                    ModelState.AddModelError("Confirmation", "The passwords you entered do not match.");
-            }
-
-            if (!ModelState.IsValid)
-                return View(model);
-
-            var result = await _tokenService.RedeemPasswordTokenAsync(model.Token, model.EmailAddress, model.Password);
-
-            if (!string.IsNullOrWhiteSpace(result))
-            {
-                ModelState.AddModelError("Execution", result);
-
-                return View(model);
-            }
-
-            return RedirectToAction("Index", "Home", new { area = "" });
-        }
-    }
-}
\ No newline at end of file
diff --git a/Portal.CMS.Web/Areas/Authentication/Controllers/RegistrationController.cs b/Portal.CMS.Web/Areas/Authentication/Controllers/RegistrationController.cs
deleted file mode 100644
index 0def067..0000000
--- a/Portal.CMS.Web/Areas/Authentication/Controllers/RegistrationController.cs
+++ /dev/null
@@ -1,68 +0,0 @@
-using Portal.CMS.Services.Authentication;
-using Portal.CMS.Web.Areas.Authentication.ViewModels.Registration;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using System.Web.Mvc;
-
-namespace Portal.CMS.Web.Areas.Authentication.Controllers
-{
-    public class RegistrationController : Controller
-    {
-        private readonly IUserService _userService;
-        private readonly IRoleService _roleService;
-        private readonly IRegistrationService _registrationService;
-
-        public RegistrationController(IUserService userService, IRoleService roleService, IRegistrationService registrationService)
-        {
-            _userService = userService;
-            _roleService = roleService;
-            _registrationService = registrationService;
-        }
-
-        [HttpGet]
-        [OutputCache(Duration = 86400)]
-        public ActionResult Index()
-        {
-            return View("_RegistrationForm", new RegisterViewModel());
-        }
-
-        [HttpPost]
-        [ValidateAntiForgeryToken]
-        public async Task<ActionResult> Register(RegisterViewModel model)
-        {
-            if (!ModelState.IsValid)
-                return View("_RegistrationForm", model);
-
-            var isAdministrator = false;
-
-            var userId = await _registrationService.RegisterAsync(model.EmailAddress, model.Password, model.GivenName, model.FamilyName);
-
-            switch (userId.Value)
-            {
-                case -1:
-                    ModelState.AddModelError("EmailAddressUsed", "The Email Address you entered is already registered");
-                    return View("_RegistrationForm", model);
-
-                default:
-                    if (await _userService.GetUserCountAsync() == 1)
-                    {
-                        await _roleService.UpdateAsync(userId.Value, new List<string> { nameof(Admin), "Authenticated" });
-
-                        isAdministrator = true;
-                    }
-                    else
-                    {
-                        await _roleService.UpdateAsync(userId.Value, new List<string> { "Authenticated" });
-                    }
-
-                    Session.Add("UserAccount", await _userService.GetUserAsync(userId.Value));
-                    Session.Add("UserRoles", await _roleService.GetAsync(userId));
-
-                    if (isAdministrator)
-                        return Content("Setup");
-
-                    return Content("Refresh");
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/Portal.CMS.Web/Areas/Authentication/Controllers/SingleSignOnController.cs b/Portal.CMS.Web/Areas/Authentication/Controllers/SingleSignOnController.cs
deleted file mode 100644
index 2e22a01..0000000
--- a/Portal.CMS.Web/Areas/Authentication/Controllers/SingleSignOnController.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-using Portal.CMS.Services.Authentication;
-using Portal.CMS.Web.Architecture.Helpers;
-using System;
-using System.Threading.Tasks;
-using System.Web.Mvc;
-
-namespace Portal.CMS.Web.Areas.Authentication.Controllers
-{
-    public class SingleSignOnController : Controller
-    {
-        private readonly ILoginService _loginService;
-        private readonly IRoleService _roleService;
-        private readonly IUserService _userService;
-
-        public SingleSignOnController(ILoginService loginService, IRoleService roleService, IUserService userService)
-        {
-            _loginService = loginService;
-            _roleService = roleService;
-            _userService = userService;
-        }
-
-        public async Task<ActionResult> Index()
-        {
-            var resetCookie = Request.Cookies["PortalCMS_SSO"];
-
-            if (!UserHelper.IsLoggedIn && resetCookie != null)
-            {
-                var cookieValues = resetCookie.Value.Split(',');
-
-                var result = await _loginService.SSOAsync(Convert.ToInt32(cookieValues[0]), cookieValues[2]);
-
-                if (result.HasValue)
-                {
-                    Session.Add("UserAccount", await _userService.GetUserAsync(result.Value));
-                    Session.Add("UserRoles", await _roleService.GetAsync(result));
-                }
-
-                resetCookie.Expires = DateTime.Now.AddDays(-1);
-                Response.Cookies.Add(resetCookie);
-            }
-
-            return RedirectToAction("Index", "Home", new { area = "" });
-        }
-    }
-}
\ No newline at end of file
diff --git a/Portal.CMS.Web/Areas/Authentication/ViewModel/Login/LoginViewModel.cs b/Portal.CMS.Web/Areas/Authentication/ViewModel/Login/LoginViewModel.cs
deleted file mode 100644
index 4a534de..0000000
--- a/Portal.CMS.Web/Areas/Authentication/ViewModel/Login/LoginViewModel.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using System.ComponentModel;
-using System.ComponentModel.DataAnnotations;
-
-namespace Portal.CMS.Web.Areas.Authentication.ViewModels.Login
-{
-    public class LoginViewModel
-    {
-        [DisplayName("Email")]
-        [Required]
-        public string EmailAddress { get; set; }
-
-        [DisplayName("Password")]
-        [Required]
-        public string Password { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/Portal.CMS.Web/Areas/Authentication/ViewModel/Recovery/ResetViewModel.cs b/Portal.CMS.Web/Areas/Authentication/ViewModel/Recovery/ResetViewModel.cs
deleted file mode 100644
index 07702be..0000000
--- a/Portal.CMS.Web/Areas/Authentication/ViewModel/Recovery/ResetViewModel.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using System.ComponentModel;
-using System.ComponentModel.DataAnnotations;
-
-namespace Portal.CMS.Web.Areas.Authentication.ViewModels.Recovery
-{
-    public class ResetViewModel
-    {
-        public string Token { get; set; }
-
-        [Required]
-        [DisplayName("Email")]
-        public string EmailAddress { get; set; }
-
-        [Required]
-        [DisplayName("Password")]
-        public string Password { get; set; }
-
-        [Required]
-        [DisplayName("Confirm")]
-        public string ConfirmPassword { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/Portal.CMS.Web/Areas/Authentication/ViewModel/Registration/RegisterViewModel.cs b/Portal.CMS.Web/Areas/Authentication/ViewModel/Registration/RegisterViewModel.cs
deleted file mode 100644
index 5057602..0000000
--- a/Portal.CMS.Web/Areas/Authentication/ViewModel/Registration/RegisterViewModel.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using System.ComponentModel;
-using System.ComponentModel.DataAnnotations;
-
-namespace Portal.CMS.Web.Areas.Authentication.ViewModels.Registration
-{
-    public class RegisterViewModel
-    {
-        [DisplayName("Email")]
-        [Required]
-        public string EmailAddress { get; set; }
-
-        [DisplayName("Password")]
-        [Required]
-        public string Password { get; set; }
-
-        [DisplayName("First Name")]
-        [Required]
-        public string GivenName { get; set; }
-
-        [DisplayName("Last Name")]
-        [Required]
-        public string FamilyName { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/Portal.CMS.Web/Areas/Authentication/Views/Login/_LoginForm.cshtml b/Portal.CMS.Web/Areas/Authentication/Views/Login/_LoginForm.cshtml
deleted file mode 100644
index 092b9ff..0000000
--- a/Portal.CMS.Web/Areas/Authentication/Views/Login/_LoginForm.cshtml
+++ /dev/null
@@ -1,60 +0,0 @@
-@model Portal.CMS.Web.Areas.Authentication.ViewModels.Login.LoginViewModel
-@{
-    Layout = "";
-}
-
-<ul class="nav nav-tabs">
-    <li role="presentation" class="active"><a href="#tab-login" aria-controls="tab-login" role="tab" data-toggle="tab"><span class="fa fa-lock"></span>Login</a></li>
-    @if (!string.IsNullOrWhiteSpace(SettingHelper.Get("SendGrid ApiKey")))
-    {
-        <li role="presentation" class=""><a href="#tab-forgot" aria-controls="tab-forgot" role="tab" data-toggle="tab"><span class="fa fa-question"></span>Forgot Password?</a></li>
-    }
-</ul>
-<div class="tab-content">
-    <div role="tabpanel" class="tab-pane active" id="tab-login">
-        @Html.Action("Render", "CopyManager", new { area = "Admin", copyName = "Sign In Message" })
-
-        @using (Html.BeginForm("Login", "Login", FormMethod.Post, new { area = "Authentication" }))
-        {
-            @Html.AntiForgeryToken()
-
-            @Html.ValidationMessage("InvalidCredentials")
-
-            @Html.ValidationMessage("EmailAddress")
-            <div class="control-group">
-                @Html.LabelFor(x => x.EmailAddress)
-                @Html.TextBoxFor(x => x.EmailAddress, new { placeholder = "Email Address" })
-            </div>
-
-            @Html.ValidationMessage("Password")
-            <div class="control-group">
-                @Html.LabelFor(x => x.Password)
-                @Html.PasswordFor(x => x.Password, new { placeholder = "Password" })
-            </div>
-
-            <div class="button-group float-container">
-                <button class="btn primary"><span class="fa fa-check"></span><span class="hidden-xs">Sign In</span></button>
-                <button class="btn" data-dismiss="modal"><span class="fa fa-times"></span><span class="hidden-xs">Cancel</span></button>
-            </div>
-        }
-    </div>
-    <div role="tabpanel" class="tab-pane" id="tab-forgot">
-        @using (Html.BeginForm("Forgot", "Recovery", FormMethod.Post, new { area = "Authentication" }))
-        {
-            @Html.AntiForgeryToken()
-
-            <div class="alert alert-warning" role="alert">We will send you a link by email that you can use to reset your password.</div>
-
-            @Html.ValidationMessage("EmailAddress")
-            <div class="control-group">
-                @Html.LabelFor(x => x.EmailAddress)
-                @Html.TextBoxFor(x => x.EmailAddress, new { placeholder = "Email Address" })
-            </div>
-
-            <div class="button-group float-container">
-                <button class="btn primary">Send Email</button>
-                <button class="btn" data-dismiss="modal">Cancel</button>
-            </div>
-        }
-    </div>
-</div>
\ No newline at end of file
diff --git a/Portal.CMS.Web/Areas/Authentication/Views/Recovery/Reset.cshtml b/Portal.CMS.Web/Areas/Authentication/Views/Recovery/Reset.cshtml
deleted file mode 100644
index 46a0417..0000000
--- a/Portal.CMS.Web/Areas/Authentication/Views/Recovery/Reset.cshtml
+++ /dev/null
@@ -1,63 +0,0 @@
-@model Portal.CMS.Web.Areas.Authentication.ViewModels.Recovery.ResetViewModel
-@{
-    ViewBag.Title = "Reset Password";
-    Layout = "~/Views/Shared/_Layout.cshtml";
-}
-
-<style>
-    label
-    {
-        color: black;
-    }
-
-    input
-    {
-        color: black;
-    }
-</style>
-
-<section class="header background-parallax height-tall" style="background-image: url('/Areas/Authentication/Content/Images/reset-background-image.jpg');">
-    <div class="overlay overlay-medium"></div>
-    <div class="vertical-alignment component-container">
-        <h1>Reset Password</h1>
-        <p>Please enter your email address and the password you want below to use.</p>
-        <br />
-
-        <div class="container dark">
-            @using (Html.BeginForm("Reset", "Recovery", FormMethod.Post, new { area = "Authentication" }))
-            {
-                @Html.AntiForgeryToken()
-
-                @Html.HiddenFor(x => x.Token)
-
-                <div class="col-xs-12 col-sm-push-2 col-sm-8">
-                    @Html.ValidationMessage("Confirmation")
-                    @Html.ValidationMessage("Execution")
-
-                    @Html.ValidationMessage("EmailAddress")
-                    <div class="control-group">
-                        @Html.LabelFor(x => x.EmailAddress)
-                        @Html.TextBoxFor(x => x.EmailAddress, new { placeholder = "Email Address" })
-                    </div>
-
-                    @Html.ValidationMessage("Password")
-                    <div class="control-group">
-                        @Html.LabelFor(x => x.Password)
-                        @Html.PasswordFor(x => x.Password, new { placeholder = "Password" })
-                    </div>
-
-                    @Html.ValidationMessage("ConfirmPassword")
-                    <div class="control-group">
-                        @Html.LabelFor(x => x.ConfirmPassword)
-                        @Html.PasswordFor(x => x.ConfirmPassword, new { placeholder = "Confirm Password" })
-                    </div>
-
-                    <div class="button-group float-container">
-                        <button class="btn primary">Reset Password</button>
-                        <a href="~/" class="btn">Cancel</a>
-                    </div>
-                </div>
-            }
-        </div>
-    </div>
-</section>
\ No newline at end of file
diff --git a/Portal.CMS.Web/Areas/Authentication/Views/Registration/_RegistrationForm.cshtml b/Portal.CMS.Web/Areas/Authentication/Views/Registration/_RegistrationForm.cshtml
deleted file mode 100644
index 0b0f14f..0000000
--- a/Portal.CMS.Web/Areas/Authentication/Views/Registration/_RegistrationForm.cshtml
+++ /dev/null
@@ -1,39 +0,0 @@
-@model Portal.CMS.Web.Areas.Authentication.ViewModels.Registration.RegisterViewModel
-@{
-    Layout = "";
-}
-
-@using (Html.BeginForm("Register", "Registration", FormMethod.Post, new { area = "Authentication" }))
-{
-    @Html.AntiForgeryToken()
-
-    @Html.ValidationMessage("GivenName")
-    <div class="control-group">
-        @Html.LabelFor(x => x.GivenName)
-        @Html.TextBoxFor(x => x.GivenName, new { placeholder = "First Name" })
-    </div>
-
-    @Html.ValidationMessage("FamilyName")
-    <div class="control-group">
-        @Html.LabelFor(x => x.FamilyName)
-        @Html.TextBoxFor(x => x.FamilyName, new { placeholder = "Last Name" })
-    </div>
-
-    @Html.ValidationMessage("EmailAddress")
-    @Html.ValidationMessage("EmailAddressUsed")
-    <div class="control-group">
-        @Html.LabelFor(x => x.EmailAddress)
-        @Html.TextBoxFor(x => x.EmailAddress, new { placeholder = "Email Address" })
-    </div>
-
-    @Html.ValidationMessage("Password")
-    <div class="control-group">
-        @Html.LabelFor(x => x.Password)
-        @Html.PasswordFor(x => x.Password, new { placeholder = "Password" })
-    </div>
-
-    <div class="button-group float-container">
-        <button class="btn primary">Register</button>
-        <button class="btn" data-dismiss="modal">Cancel</button>
-    </div>
-}
\ No newline at end of file
diff --git a/Portal.CMS.Web/Areas/Forms/Controllers/ContactWidgetsController.cs b/Portal.CMS.Web/Areas/Forms/Controllers/ContactWidgetsController.cs
deleted file mode 100644
index 529d6ea..0000000
--- a/Portal.CMS.Web/Areas/Forms/Controllers/ContactWidgetsController.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-using Portal.CMS.Services.Authentication;
-using Portal.CMS.Web.Architecture.Helpers;
-using Portal.CMS.Web.Areas.Forms.ViewModels.ContactWidgets;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using System.Web.Mvc;
-using System.Web.SessionState;
-
-namespace Portal.CMS.Web.Areas.Forms.Controllers
-{
-    [SessionState(SessionStateBehavior.ReadOnly)]
-    public class ContactWidgetsController : Controller
-    {
-        #region Dependencies
-
-        private readonly IUserService _userService;
-
-        public ContactWidgetsController(IUserService userService)
-        {
-            _userService = userService;
-        }
-
-        #endregion Dependencies
-
-        [HttpGet]
-        [OutputCache(Duration = 86400)]
-        public ActionResult SubmitMessageWidget()
-        {
-            var model = new SubmitMessageViewModel();
-
-            if (UserHelper.IsLoggedIn)
-            {
-                model.Name = UserHelper.FullName;
-                model.EmailAddress = UserHelper.EmailAddress;
-            }
-
-            return PartialView("_SubmitMessageWidget", model);
-        }
-
-        [HttpPost]
-        [ValidateAntiForgeryToken]
-        public async Task<ActionResult> SubmitMessageWidget(SubmitMessageViewModel model)
-        {
-            var recipients = await _userService.GetAsync(new List<string> { nameof(Admin) });
-
-            await EmailHelper.SendEmailAsync(
-                recipients.Select(x => x.EmailAddress).First(),
-                "Contact Submitted",
-                $@"<p>Hello, we thought you might like to know that a visitor to your website has submitted a message, here are the details we recorded.</p>
-                <p>Name: {model.Name}</p>
-                <p>Email Address: {model.EmailAddress}</p>
-                <p>Subject: {model.Subject}</p>
-                <p>Message: {model.Message}</p>");
-
-            return RedirectToAction("Index", "Home", new { area = "" });
-        }
-    }
-}
\ No newline at end of file
diff --git a/Portal.CMS.Web/Areas/PageBuilder/ViewModels/Theme/ThemeViewModel.cs b/Portal.CMS.Web/Areas/PageBuilder/ViewModels/Theme/ThemeViewModel.cs
deleted file mode 100644
index dbd0155..0000000
--- a/Portal.CMS.Web/Areas/PageBuilder/ViewModels/Theme/ThemeViewModel.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using Portal.CMS.Entities.Entities;
-
-namespace Portal.CMS.Web.Areas.PageBuilder.ViewModels.Theme
-{
-    public class ThemeViewModel
-    {
-        public CustomTheme Theme { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/Portal.CMS.Web/Areas/PageBuilder/Views/web.config b/Portal.CMS.Web/Areas/PageBuilder/Views/web.config
deleted file mode 100644
index f7b854e..0000000
--- a/Portal.CMS.Web/Areas/PageBuilder/Views/web.config
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0"?>
-
-<configuration>
-  <configSections>
-    <sectionGroup name="system.web.webPages.razor" type="System.Web.WebPages.Razor.Configuration.RazorWebSectionGroup, System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
-      <section name="host" type="System.Web.WebPages.Razor.Configuration.HostSection, System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" />
-      <section name="pages" type="System.Web.WebPages.Razor.Configuration.RazorPagesSection, System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" />
-    </sectionGroup>
-  </configSections>
-
-  <system.web.webPages.razor>
-    <host factoryType="System.Web.Mvc.MvcWebRazorHostFactory, System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-    <pages pageBaseType="System.Web.Mvc.WebViewPage">
-      <namespaces>
-        <add namespace="System.Web.Mvc" />
-        <add namespace="System.Web.Mvc.Ajax" />
-        <add namespace="System.Web.Mvc.Html" />
-        <add namespace="System.Web.Routing" />
-        <add namespace="System.Web.Optimization" />
-        <add namespace="Portal.CMS.Web" />
-        <add namespace="Portal.CMS.Web.Areas.Admin.ViewModels.Dashboard" />
-        <add namespace="Portal.CMS.Entities.Enumerators" />
-        <add namespace="Portal.CMS.Entities.Entities" />
-        <add namespace="Portal.CMS.Web.Architecture.Helpers" />
-        <add namespace="Portal.CMS.Web.Architecture.Extensions" />
-      </namespaces>
-    </pages>
-  </system.web.webPages.razor>
-
-  <appSettings>
-    <add key="webpages:Enabled" value="false" />
-  </appSettings>
-
-  <system.webServer>
-    <handlers>
-      <remove name="BlockViewHandler" />
-      <add name="BlockViewHandler" path="*" verb="*" preCondition="integratedMode" type="System.Web.HttpNotFoundHandler" />
-    </handlers>
-  </system.webServer>
-</configuration>
\ No newline at end of file
diff --git a/Portal.CMS.Web/Areas/Profile/Content/Media/Avatars/media-02042017182252-1-giftdemon-image.jpg b/Portal.CMS.Web/Areas/Profile/Content/Media/Avatars/media-02042017182252-1-giftdemon-image.jpg
deleted file mode 100644
index d6a0572..0000000
Binary files a/Portal.CMS.Web/Areas/Profile/Content/Media/Avatars/media-02042017182252-1-giftdemon-image.jpg and /dev/null differ
diff --git a/Portal.CMS.Web/Areas/Profile/ViewModels/Manage/AvatarViewModel.cs b/Portal.CMS.Web/Areas/Profile/ViewModels/Manage/AvatarViewModel.cs
deleted file mode 100644
index 4e0bf7f..0000000
--- a/Portal.CMS.Web/Areas/Profile/ViewModels/Manage/AvatarViewModel.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using System.ComponentModel;
-using System.ComponentModel.DataAnnotations;
-using System.Web;
-
-namespace Portal.CMS.Web.Areas.Profile.ViewModels.Manage
-{
-    public class AvatarViewModel
-    {
-        [DisplayName("Avatar")]
-        [Required]
-        public HttpPostedFileBase AttachedImage { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/Portal.CMS.Web/Areas/Profile/Views/Manage/_Avatar.cshtml b/Portal.CMS.Web/Areas/Profile/Views/Manage/_Avatar.cshtml
deleted file mode 100644
index 6b987a9..0000000
--- a/Portal.CMS.Web/Areas/Profile/Views/Manage/_Avatar.cshtml
+++ /dev/null
@@ -1,20 +0,0 @@
-@model Portal.CMS.Web.Areas.Profile.ViewModels.Manage.AvatarViewModel
-@{
-    Layout = "";
-}
-
-@using (Html.BeginForm("EditAvatar", "Manage", FormMethod.Post, new { id = "uploadImageForm", enctype = "multipart/form-data" }))
-{
-    @Html.AntiForgeryToken()
-
-    @Html.ValidationMessage("AttachedImage")
-    <div class="control-group">
-        @Html.LabelFor(x => x.AttachedImage)
-        @Html.TextBoxFor(m => m.AttachedImage, new { @type = "file" })
-    </div>
-
-    <div class="footer">
-        <button class="btn primary">Upload Avatar</button>
-        <button class="btn" data-dismiss="modal">Cancel</button>
-    </div>
-}
\ No newline at end of file
diff --git a/Portal.CMS.Web/Areas/Profile/Views/web.config b/Portal.CMS.Web/Areas/Profile/Views/web.config
deleted file mode 100644
index adbdbb6..0000000
--- a/Portal.CMS.Web/Areas/Profile/Views/web.config
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0"?>
-
-<configuration>
-  <configSections>
-    <sectionGroup name="system.web.webPages.razor" type="System.Web.WebPages.Razor.Configuration.RazorWebSectionGroup, System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
-      <section name="host" type="System.Web.WebPages.Razor.Configuration.HostSection, System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" />
-      <section name="pages" type="System.Web.WebPages.Razor.Configuration.RazorPagesSection, System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" />
-    </sectionGroup>
-  </configSections>
-
-  <system.web.webPages.razor>
-    <host factoryType="System.Web.Mvc.MvcWebRazorHostFactory, System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-    <pages pageBaseType="System.Web.Mvc.WebViewPage">
-      <namespaces>
-        <add namespace="System.Web.Mvc" />
-        <add namespace="System.Web.Mvc.Ajax" />
-        <add namespace="System.Web.Mvc.Html" />
-        <add namespace="System.Web.Routing" />
-        <add namespace="System.Web.Optimization" />
-        <add namespace="Portal.CMS.Web" />
-        <add namespace="Portal.CMS.Web.Architecture.Helpers" />
-        <add namespace="Portal.CMS.Web.Architecture.Extensions" />
-        <add namespace="Portal.CMS.Web.Areas.Admin.ViewModels.Dashboard" />
-        <add namespace="Portal.CMS.Entities.Enumerators" />
-        <add namespace="Portal.CMS.Entities.Entities" />
-      </namespaces>
-    </pages>
-  </system.web.webPages.razor>
-
-  <appSettings>
-    <add key="webpages:Enabled" value="false" />
-  </appSettings>
-
-  <system.webServer>
-    <handlers>
-      <remove name="BlockViewHandler" />
-      <add name="BlockViewHandler" path="*" verb="*" preCondition="integratedMode" type="System.Web.HttpNotFoundHandler" />
-    </handlers>
-  </system.webServer>
-</configuration>
\ No newline at end of file
diff --git a/Portal.CMS.Web/Global.asax b/Portal.CMS.Web/Global.asax
deleted file mode 100644
index a145967..0000000
--- a/Portal.CMS.Web/Global.asax
+++ /dev/null
@@ -1 +0,0 @@
-<%@ Application Codebehind="Global.asax.cs" Inherits="Portal.CMS.Web.MvcApplication" Language="C#" %>
diff --git a/Portal.CMS.Web/Global.asax.cs b/Portal.CMS.Web/Global.asax.cs
deleted file mode 100644
index 8ba63d5..0000000
--- a/Portal.CMS.Web/Global.asax.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-using LogBook.Services;
-using LogBook.Services.Models;
-using Portal.CMS.Web.Architecture.Helpers;
-using Portal.CMS.Web.Architecture.ViewEngines;
-using System.Web.Mvc;
-using System.Web.Optimization;
-using System.Web.Razor;
-using System.Web.Routing;
-using System.Web.WebPages;
-
-namespace Portal.CMS.Web
-{
-    public class MvcApplication : System.Web.HttpApplication
-    {
-        protected void Application_Start()
-        {
-            AreaRegistration.RegisterAllAreas();
-            RouteConfig.RegisterRoutes(RouteTable.Routes);
-            BundleConfig.RegisterBundles(BundleTable.Bundles);
-
-            ViewEngines.Engines.Clear();
-            ViewEngines.Engines.Add(new RazorViewEngine());
-            ViewEngines.Engines.Add(new CSSViewEngine());
-
-            RazorCodeLanguage.Languages.Add("cscss", new CSharpRazorCodeLanguage());
-            WebPageHttpHandler.RegisterExtension("cscss");
-
-            MvcHandler.DisableMvcResponseHeader = true;
-
-            new LogHandler().WriteLog(LogType.Information, "Website Started Up", string.Empty);
-        }
-
-        protected void Application_End()
-        {
-            new LogHandler().WriteLog(LogType.Information, "Website Shutting Down", string.Empty);
-        }
-
-        protected void Application_Error()
-        {
-            var logHandler = new LogHandler();
-
-            var exception = Server.GetLastError();
-
-            var user = (UserHelper.IsLoggedIn ? $"{UserHelper.GivenName} {UserHelper.FamilyName} {UserHelper.UserId}" : string.Empty);
-
-            logHandler.WriteLog(LogType.Error, "Portal CMS", exception, exception.Message, user);
-        }
-    }
-}
\ No newline at end of file
diff --git a/Portal.CMS.Web/Web.Debug.config b/Portal.CMS.Web/Web.Debug.config
deleted file mode 100644
index 2aa1d83..0000000
--- a/Portal.CMS.Web/Web.Debug.config
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0"?>
-<configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
-  <connectionStrings>
-    <add name="PortalEntityModel" connectionString="data source=localhost\hyperbird;initial catalog=Portal;integrated security=True;MultipleActiveResultSets=True;App=EntityFramework" providerName="System.Data.SqlClient" />
-  </connectionStrings>
-</configuration>
\ No newline at end of file
diff --git a/Portal.CMS.Web/Web.Release.config b/Portal.CMS.Web/Web.Release.config
deleted file mode 100644
index d81c33c..0000000
--- a/Portal.CMS.Web/Web.Release.config
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0"?>
-<configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
-  <system.web>
-    <compilation xdt:Transform="RemoveAttributes(debug)" />
-  </system.web>
-  <appSettings>
-    <add key="CustomErrorPage" value="true" xdt:Transform="SetAttributes" xdt:Locator="Match(key)" />
-  </appSettings>
-</configuration>
\ No newline at end of file
diff --git a/Portal.CMS.Web/Web.config b/Portal.CMS.Web/Web.config
deleted file mode 100644
index 8d13ff7..0000000
--- a/Portal.CMS.Web/Web.config
+++ /dev/null
@@ -1,153 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <configSections>
-    <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
-  </configSections>
-  <connectionStrings>
-    <add name="PortalEntityModel" connectionString="data source=localhost;initial catalog=Portal;integrated security=True;MultipleActiveResultSets=True;App=EntityFramework" providerName="System.Data.SqlClient" />
-    <add name="LogBookEntityModel" connectionString="data source=localhost;initial catalog=Portal;integrated security=True;MultipleActiveResultSets=True;App=EntityFramework" providerName="System.Data.SqlClient" />
-  </connectionStrings>
-  <appSettings>
-    <add key="webpages:Version" value="3.0.0.0" />
-    <add key="webpages:Enabled" value="false" />
-    <add key="ClientValidationEnabled" value="true" />
-    <add key="UnobtrusiveJavaScriptEnabled" value="true" />
-    <add key="owin:AutomaticAppStartup" value="false" />
-    <add key="DatabaseInitializerForType Portal.CMS.Entities.PortalEntityModel, Portal.CMS.Entities" value="Portal.CMS.Entities.Initialisers.Environments.DefaultInitialiser, Portal.CMS.Entities" />
-    <add key="CustomErrorPage" value="false" />
-    <add key="vs:EnableBrowserLink" value="false" />
-  </appSettings>
-  <system.web>
-    <httpCookies httpOnlyCookies="true" />
-    <authentication mode="None" />
-    <compilation debug="true" targetFramework="4.6.2">
-      <buildProviders>
-        <add extension=".cscss" type="System.Web.WebPages.Razor.RazorBuildProvider, System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
-      </buildProviders>
-    </compilation>
-    <httpRuntime targetFramework="4.5.2" enableVersionHeader="false" />
-    <httpModules>
-      <remove name="WindowsAuthentication" />
-      <remove name="PassportAuthentication" />
-      <remove name="Profile" />
-      <remove name="AnonymousIdentification" />
-    </httpModules>
-    <trace enabled="false" />
-    <customErrors mode="On" defaultRedirect="~/PageBuilder/Error/Index">
-      <error statusCode="404" redirect="~/PageBuilder/Error/NotFound" />
-    </customErrors>
-  </system.web>
-  <system.webServer>
-    <validation validateIntegratedModeConfiguration="false" />
-    <urlCompression doStaticCompression="true" doDynamicCompression="true" dynamicCompressionBeforeCache="true" />
-    <staticContent>
-      <clientCache cacheControlMode="UseMaxAge" cacheControlMaxAge="30.00:00:00" />
-      <remove fileExtension=".woff" />
-      <mimeMap fileExtension=".woff" mimeType="application/x-font-woff" />
-      <remove fileExtension=".woff2" />
-      <mimeMap fileExtension=".woff2" mimeType="font/woff2" />
-      <remove fileExtension=".otf" />
-      <mimeMap fileExtension=".otf" mimeType="font/otf" />
-    </staticContent>
-    <httpProtocol>
-      <customHeaders>
-        <remove name="X-Powered-By" />
-        <remove name="X-Content-Type-Options" />
-        <add name="X-Content-Type-Options" value="nosniff" />
-        <remove name="X-XSS-Protection" />
-        <add name="X-XSS-Protection" value="1; mode=block" />
-        <remove name="X-Frame-Options" />
-        <add name="X-Frame-Options" value="DENY" />
-      </customHeaders>
-      <redirectHeaders>
-        <clear />
-      </redirectHeaders>
-    </httpProtocol>
-    <modules>
-      <remove name="FormsAuthentication" />
-      <add name="RemoveResponseHeadersModule" type="Portal.CMS.Web.Architecture.Modules.RemoveResponseHeadersModule" />
-    </modules>
-    
-    <rewrite>
-      <outboundRules rewriteBeforeCache="true">
-        <rule name="Remove Server Header">
-          <match serverVariable="RESPONSE_SERVER" pattern=".+" />
-          <action type="Rewrite" value="" />
-        </rule>
-      </outboundRules>
-    </rewrite>
-  <handlers>
-      <remove name="ExtensionlessUrlHandler-Integrated-4.0" />
-      <remove name="OPTIONSVerbHandler" />
-      <remove name="TRACEVerbHandler" />
-      <add name="ExtensionlessUrlHandler-Integrated-4.0" path="*." verb="*" type="System.Web.Handlers.TransferRequestHandler" preCondition="integratedMode,runtimeVersionv4.0" />
-    </handlers></system.webServer>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="Microsoft.Owin.Security" publicKeyToken="31bf3856ad364e35" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Microsoft.Owin.Security.OAuth" publicKeyToken="31bf3856ad364e35" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Microsoft.Owin.Security.Cookies" publicKeyToken="31bf3856ad364e35" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Newtonsoft.Json" culture="neutral" publicKeyToken="30ad4fe6b2a6aeed" />
-        <bindingRedirect oldVersion="0.0.0.0-11.0.0.0" newVersion="11.0.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Web.Optimization" publicKeyToken="31bf3856ad364e35" />
-        <bindingRedirect oldVersion="1.0.0.0-1.1.0.0" newVersion="1.1.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" />
-        <bindingRedirect oldVersion="0.0.0.0-1.6.5135.21930" newVersion="1.6.5135.21930" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Antlr3.Runtime" publicKeyToken="eb42632606e9261f" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-3.5.0.2" newVersion="3.5.0.2" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35" />
-        <bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" />
-        <bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
-        <bindingRedirect oldVersion="1.0.0.0-5.2.6.0" newVersion="5.2.6.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.1.1.2" newVersion="4.1.1.2" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
-  <entityFramework>
-    <defaultConnectionFactory type="System.Data.Entity.Infrastructure.LocalDbConnectionFactory, EntityFramework">
-      <parameters>
-        <parameter value="mssqllocaldb" />
-      </parameters>
-    </defaultConnectionFactory>
-    <providers>
-      <provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer" />
-    </providers>
-  </entityFramework>
-  <system.codedom>
-    <compilers>
-      <compiler language="c#;cs;csharp" extension=".cs" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.CSharpCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:default /nowarn:1659;1699;1701" />
-      <compiler language="vb;vbs;visualbasic;vbscript" extension=".vb" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.VBCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:default /nowarn:41008 /define:_MYTYPE=\&quot;Web\&quot; /optionInfer+" />
-    </compilers>
-  </system.codedom>
-</configuration>
\ No newline at end of file
diff --git a/Portal.CMS.Entities/App.config b/PortalCMS.Entities/App.config
similarity index 71%
rename from Portal.CMS.Entities/App.config
rename to PortalCMS.Entities/App.config
index c146938..061d117 100644
--- a/Portal.CMS.Entities/App.config
+++ b/PortalCMS.Entities/App.config
@@ -16,4 +16,12 @@
   <startup>
     <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
   </startup>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
 </configuration>
\ No newline at end of file
diff --git a/Portal.CMS.Entities/Entities/AnalyticPageView.cs b/PortalCMS.Entities/Entities/AnalyticPageView.cs
similarity index 88%
rename from Portal.CMS.Entities/Entities/AnalyticPageView.cs
rename to PortalCMS.Entities/Entities/AnalyticPageView.cs
index 40068e0..7bf31d6 100644
--- a/Portal.CMS.Entities/Entities/AnalyticPageView.cs
+++ b/PortalCMS.Entities/Entities/AnalyticPageView.cs
@@ -1,7 +1,7 @@
 using System;
 using System.ComponentModel.DataAnnotations;
 
-namespace Portal.CMS.Entities.Entities
+namespace PortalCMS.Entities.Entities
 {
     public class AnalyticPageView
     {
@@ -27,6 +27,6 @@ public class AnalyticPageView
 
         public string ReferredUrl { get; set; }
 
-        public int UserId { get; set; }
+        public string UserId { get; set; }
     }
 }
\ No newline at end of file
diff --git a/Portal.CMS.Entities/Entities/AnalyticPostView.cs b/PortalCMS.Entities/Entities/AnalyticPostView.cs
similarity index 85%
rename from Portal.CMS.Entities/Entities/AnalyticPostView.cs
rename to PortalCMS.Entities/Entities/AnalyticPostView.cs
index 3da8951..6a198ba 100644
--- a/Portal.CMS.Entities/Entities/AnalyticPostView.cs
+++ b/PortalCMS.Entities/Entities/AnalyticPostView.cs
@@ -1,7 +1,7 @@
 using System;
 using System.ComponentModel.DataAnnotations;
 
-namespace Portal.CMS.Entities.Entities
+namespace PortalCMS.Entities.Entities
 {
     public class AnalyticPostView
     {
@@ -22,6 +22,6 @@ public class AnalyticPostView
 
         public string ReferredUrl { get; set; }
 
-        public int UserId { get; set; }
+        public string UserId { get; set; }
     }
 }
\ No newline at end of file
diff --git a/Portal.CMS.Entities/Entities/CopyItem.cs b/PortalCMS.Entities/Entities/CopyItem.cs
similarity index 91%
rename from Portal.CMS.Entities/Entities/CopyItem.cs
rename to PortalCMS.Entities/Entities/CopyItem.cs
index db984be..432c33c 100644
--- a/Portal.CMS.Entities/Entities/CopyItem.cs
+++ b/PortalCMS.Entities/Entities/CopyItem.cs
@@ -1,7 +1,7 @@
 using System;
 using System.ComponentModel.DataAnnotations;
 
-namespace Portal.CMS.Entities.Entities
+namespace PortalCMS.Entities.Entities
 {
     public class CopyItem
     {
diff --git a/Portal.CMS.Entities/Entities/CustomTheme.cs b/PortalCMS.Entities/Entities/CustomTheme.cs
similarity index 97%
rename from Portal.CMS.Entities/Entities/CustomTheme.cs
rename to PortalCMS.Entities/Entities/CustomTheme.cs
index 08a4b9a..ef5d2b1 100644
--- a/Portal.CMS.Entities/Entities/CustomTheme.cs
+++ b/PortalCMS.Entities/Entities/CustomTheme.cs
@@ -2,7 +2,7 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Portal.CMS.Entities.Entities
+namespace PortalCMS.Entities.Entities
 {
     public class CustomTheme
     {
diff --git a/Portal.CMS.Entities/Entities/Font.cs b/PortalCMS.Entities/Entities/Font.cs
similarity index 92%
rename from Portal.CMS.Entities/Entities/Font.cs
rename to PortalCMS.Entities/Entities/Font.cs
index 2235c79..7d18fe9 100644
--- a/Portal.CMS.Entities/Entities/Font.cs
+++ b/PortalCMS.Entities/Entities/Font.cs
@@ -1,7 +1,7 @@
 using System;
 using System.ComponentModel.DataAnnotations;
 
-namespace Portal.CMS.Entities.Entities
+namespace PortalCMS.Entities.Entities
 {
     public class Font
     {
diff --git a/Portal.CMS.Entities/Entities/Image.cs b/PortalCMS.Entities/Entities/Image.cs
similarity index 76%
rename from Portal.CMS.Entities/Entities/Image.cs
rename to PortalCMS.Entities/Entities/Image.cs
index a037b3c..df0e3e9 100644
--- a/Portal.CMS.Entities/Entities/Image.cs
+++ b/PortalCMS.Entities/Entities/Image.cs
@@ -1,7 +1,7 @@
-using Portal.CMS.Entities.Enumerators;
+using PortalCMS.Entities.Enumerators;
 using System.ComponentModel.DataAnnotations;
 
-namespace Portal.CMS.Entities.Entities
+namespace PortalCMS.Entities.Entities
 {
     public class Image
     {
diff --git a/Portal.CMS.Entities/Entities/MenuItem.cs b/PortalCMS.Entities/Entities/MenuItem.cs
similarity index 94%
rename from Portal.CMS.Entities/Entities/MenuItem.cs
rename to PortalCMS.Entities/Entities/MenuItem.cs
index 0659d15..f97f635 100644
--- a/Portal.CMS.Entities/Entities/MenuItem.cs
+++ b/PortalCMS.Entities/Entities/MenuItem.cs
@@ -2,7 +2,7 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Portal.CMS.Entities.Entities
+namespace PortalCMS.Entities.Entities
 {
     public class MenuItem
     {
diff --git a/Portal.CMS.Entities/Entities/MenuItemRole.cs b/PortalCMS.Entities/Entities/MenuItemRole.cs
similarity index 58%
rename from Portal.CMS.Entities/Entities/MenuItemRole.cs
rename to PortalCMS.Entities/Entities/MenuItemRole.cs
index 7c22b6e..b58558e 100644
--- a/Portal.CMS.Entities/Entities/MenuItemRole.cs
+++ b/PortalCMS.Entities/Entities/MenuItemRole.cs
@@ -1,7 +1,8 @@
-using System.ComponentModel.DataAnnotations;
+using PortalCMS.Entities.Entities.Models;
+using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Portal.CMS.Entities.Entities
+namespace PortalCMS.Entities.Entities
 {
     public class MenuItemRole
     {
@@ -14,8 +15,8 @@ public class MenuItemRole
         public virtual MenuItem MenuItem { get; set; }
 
         [ForeignKey("Role")]
-        public int RoleId { get; set; }
+        public string RoleId { get; set; }
 
-        public virtual Role Role { get; set; }
+        public virtual ApplicationRole Role { get; set; }
     }
 }
\ No newline at end of file
diff --git a/Portal.CMS.Entities/Entities/MenuSystem.cs b/PortalCMS.Entities/Entities/MenuSystem.cs
similarity index 88%
rename from Portal.CMS.Entities/Entities/MenuSystem.cs
rename to PortalCMS.Entities/Entities/MenuSystem.cs
index cde6481..d2a6133 100644
--- a/Portal.CMS.Entities/Entities/MenuSystem.cs
+++ b/PortalCMS.Entities/Entities/MenuSystem.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 
-namespace Portal.CMS.Entities.Entities
+namespace PortalCMS.Entities.Entities
 {
     public class MenuSystem
     {
diff --git a/PortalCMS.Entities/Entities/Models/ApplicationRole.cs b/PortalCMS.Entities/Entities/Models/ApplicationRole.cs
new file mode 100644
index 0000000..0c4b23b
--- /dev/null
+++ b/PortalCMS.Entities/Entities/Models/ApplicationRole.cs
@@ -0,0 +1,16 @@
+using Microsoft.AspNet.Identity.EntityFramework;
+using System.ComponentModel;
+using System.ComponentModel.DataAnnotations;
+
+namespace PortalCMS.Entities.Entities.Models
+{
+	public class ApplicationRole : IdentityRole
+	{
+		public ApplicationRole() { }
+		public ApplicationRole(string name) { Name = name; }
+
+		[Required]
+		[DefaultValue("true")]
+		public bool IsAssignable { get; set; }
+	}
+}
\ No newline at end of file
diff --git a/PortalCMS.Entities/Entities/Models/ApplicationUser.cs b/PortalCMS.Entities/Entities/Models/ApplicationUser.cs
new file mode 100644
index 0000000..267e721
--- /dev/null
+++ b/PortalCMS.Entities/Entities/Models/ApplicationUser.cs
@@ -0,0 +1,107 @@
+using Microsoft.AspNet.Identity;
+using Microsoft.AspNet.Identity.EntityFramework;
+using PortalCMS.Entities.Enumerators;
+using System;
+using System.ComponentModel;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.Security.Claims;
+using System.Threading.Tasks;
+
+namespace PortalCMS.Entities.Entities.Models
+{
+	public class ApplicationUser : IdentityUser
+	{
+		[Required]
+		[Display(Name = "Given Name")]
+		public string GivenName { get; set; }
+
+		[Required]
+		[Display(Name = "Family Name")]
+		public string FamilyName { get; set; }
+
+		/// <summary>
+		/// Gets users full name.
+		/// </summary>
+		[NotMapped]
+		[Display(Name = "Full Name")]
+		public virtual string FullName
+		{
+			get { return string.Format("{0} {1}", GivenName, FamilyName); }
+		}
+
+		/// <summary>
+		/// True if the email is confirmed, default is false
+		/// </summary>
+		[Display(Name = "Email Confirmed")]
+		public override bool EmailConfirmed { get; set; }
+
+		/// <summary>
+		/// Gets or sets the users phone number
+		/// </summary>
+		[Display(Name = "Phone Number")]
+		public override string PhoneNumber { get; set; }
+
+		/// <summary>
+		/// True if the phone number is confirmed, default is false
+		/// </summary>
+		[Display(Name = "Phone Confirmed")]
+		public override bool PhoneNumberConfirmed { get; set; }
+
+		/// <summary>
+		/// Is lockout enabled for this user
+		/// </summary>
+		[Display(Name = "Lockout Enabled")]
+		public override bool LockoutEnabled { get; set; }
+
+		/// <summary>
+		/// Gets or sets the users registration date and time.
+		/// </summary>
+		[Required]
+		[Display(Name = "Registered On")]
+		[DisplayFormat(DataFormatString = "{0:dd-MMM-yyyy hh:mm}")]
+		public virtual DateTime RegistrationDate { get; set; }
+
+		/// <summary>
+		/// Gets or sets the users last login date and time.
+		/// </summary>
+		[Display(Name = "Last Login")]
+		[DisplayFormat(DataFormatString = "{0:dd-MMM-yyyy hh:mm}")]
+		public virtual DateTime? LastLoginDate { get; set; }
+
+		/// <summary>
+		/// Gets or sets the users last login date and time.
+		/// </summary>
+		[Display(Name = "Last Logout")]
+		[DisplayFormat(DataFormatString = "{0:dd-MMM-yyyy hh:mm}")]
+		public virtual DateTime? LastLogoutDate { get; set; }
+
+		[Display(Name = "Short bio")]
+		public string Bio { get; set; }
+
+		[Required]
+		[Display(Name = "Last Updated")]
+		public DateTime LastUpdatedDate { get; set; }
+
+		public FileDetail AvatarImage { get; set; }
+
+		[Display(Name = "Status")]
+		public virtual RecordStatus Status { get; set; }
+
+		public ApplicationUser()
+		{
+			this.AvatarImage = new FileDetail();
+			this.Status = RecordStatus.Enabled;
+		}
+
+		public async Task<ClaimsIdentity> GenerateUserIdentityAsync(UserManager<ApplicationUser> manager)
+		{
+			// Note the authenticationType must match the one defined in
+			// CookieAuthenticationOptions.AuthenticationType 
+			var userIdentity = await manager.CreateIdentityAsync(this, DefaultAuthenticationTypes.ApplicationCookie);
+
+			// Add custom user claims here 
+			return userIdentity;
+		}
+	}
+}
\ No newline at end of file
diff --git a/PortalCMS.Entities/Entities/Models/FileDetail.cs b/PortalCMS.Entities/Entities/Models/FileDetail.cs
new file mode 100644
index 0000000..030f6c9
--- /dev/null
+++ b/PortalCMS.Entities/Entities/Models/FileDetail.cs
@@ -0,0 +1,66 @@
+using PortalCMS.Entities.Enumerators;
+using System.ComponentModel.DataAnnotations;
+using System.IO;
+using System.Web;
+
+namespace PortalCMS.Entities.Entities.Models
+{
+	public class FileDetail
+  {
+    [Display(Name = "File")]
+    public byte[] FileContent { get; set; }
+
+    public int FileLength { get; set; }
+
+    public ImageCategory ContentType { get; set; }
+
+    public FileDetail() { }
+
+    public FileDetail(HttpPostedFileBase fileUpload, ImageCategory contentType = ImageCategory.Profile)
+    {
+      if (fileUpload != null)
+      {
+        Stream fileStream = fileUpload.InputStream;
+        int fileLength = fileUpload.ContentLength;
+
+        this.FileLength = fileLength;
+        this.ContentType = contentType;
+        this.FileContent = new byte[fileLength];
+
+        fileStream.Read(this.FileContent, 0, fileLength);
+      }
+    }
+
+		public static byte[] LoadImageBytesFromPath(string directory, string fileName)
+		{
+			const string importDirectory = "~/App_Data";
+			byte[] imageData = null;
+			var imagePath = Path.Combine(HttpContext.Current.Server.MapPath(importDirectory), directory, fileName);
+
+			if (File.Exists(imagePath))
+			{
+				imageData = File.ReadAllBytes(imagePath);
+			}
+
+			return imageData;
+		}
+
+		public static FileDetail LoadImageFromPath(string importDirectory="~/App_Data", string fileName="noImage.png", ImageCategory imageCategory= ImageCategory.General)
+		{
+			byte[] imageData = null;
+			var imagePath = Path.Combine(HttpContext.Current.Server.MapPath(importDirectory), fileName);
+
+			if (File.Exists(imagePath))
+			{
+				imageData = File.ReadAllBytes(imagePath);
+			}
+
+			return new FileDetail
+			{
+				FileLength = imageData.Length,
+				ContentType = imageCategory,
+				FileContent = imageData
+			};
+		}
+	}
+}
diff --git a/PortalCMS.Entities/Entities/Models/IdentityConfig.cs b/PortalCMS.Entities/Entities/Models/IdentityConfig.cs
new file mode 100644
index 0000000..3377f32
--- /dev/null
+++ b/PortalCMS.Entities/Entities/Models/IdentityConfig.cs
@@ -0,0 +1,139 @@
+using System.Linq;
+using System.Security.Claims;
+using Microsoft.AspNet.Identity;
+using Microsoft.AspNet.Identity.EntityFramework;
+using Microsoft.AspNet.Identity.Owin;
+using Microsoft.Owin;
+using Microsoft.Owin.Security;
+using System;
+using System.Collections.Generic;
+using System.Data.Entity;
+using System.Threading.Tasks;
+using System.Web;
+
+namespace PortalCMS.Entities.Entities.Models
+{
+	// Configure the application user manager used in this application. UserManager is defined in ASP.NET Identity and is used by the application.
+	public class ApplicationUserManager : UserManager<ApplicationUser>
+	{
+		public ApplicationUserManager(IUserStore<ApplicationUser> store) : base(store)
+		{
+		}
+
+		public static ApplicationUserManager Create(IdentityFactoryOptions<ApplicationUserManager> options,IOwinContext context)
+		{
+			var manager = new ApplicationUserManager(new UserStore<ApplicationUser>(context.Get<PortalDbContext>()));
+
+			// Configure validation logic for usernames
+			manager.UserValidator = new UserValidator<ApplicationUser>(manager)
+			{
+				AllowOnlyAlphanumericUserNames = false,
+				RequireUniqueEmail = true
+			};
+
+			// Configure validation logic for passwords
+			manager.PasswordValidator = new PasswordValidator
+			{
+				RequiredLength = 6,
+				RequireNonLetterOrDigit = true,
+				RequireDigit = true,
+				RequireLowercase = true,
+				RequireUppercase = true,
+			};
+			// Configure user lockout defaults
+			manager.UserLockoutEnabledByDefault = true;
+			manager.DefaultAccountLockoutTimeSpan = TimeSpan.FromMinutes(5);
+			manager.MaxFailedAccessAttemptsBeforeLockout = 5;
+			// Register two factor authentication providers. This application uses Phone and Emails as a step of receiving a code for verifying the user
+			// You can write your own provider and plug in here.
+			manager.RegisterTwoFactorProvider("PhoneCode", new PhoneNumberTokenProvider<ApplicationUser>
+			{
+				MessageFormat = "Your security code is: {0}"
+			});
+
+			manager.RegisterTwoFactorProvider("EmailCode", new EmailTokenProvider<ApplicationUser>
+			{
+				Subject = "SecurityCode",
+				BodyFormat = "Your security code is {0}"
+			});
+
+			manager.EmailService = new EmailService();
+			manager.SmsService = new SmsService();
+
+			var dataProtectionProvider = options.DataProtectionProvider;
+			if (dataProtectionProvider != null)
+			{
+				manager.UserTokenProvider = new DataProtectorTokenProvider<ApplicationUser, string>(dataProtectionProvider.Create("PortalCMS"));
+			}
+
+			return manager;
+		}
+
+		public bool Validate(IEnumerable<ApplicationRole> entityRoles, IEnumerable<string> userRoles)
+		{
+			// PASS: Where no roles are specified on the entity, access is granted to all users.
+			if (!entityRoles.Any())
+				return true;
+
+			// PASS: Administrators can access any content.
+			if (userRoles.Any(x => x.Equals("Admin", System.StringComparison.OrdinalIgnoreCase)))
+				return true;
+
+			// EVALUATE: Every Role on the Entity. One match grants access.
+			foreach (var role in entityRoles)
+				if (userRoles.Contains(role.Name))
+					return true;
+
+			return false;
+		}
+	}
+
+	// Configure the RoleManager used in the application. RoleManager is defined in the ASP.NET Identity core assembly
+	public class ApplicationRoleManager : RoleManager<ApplicationRole>
+	{
+		public ApplicationRoleManager(IRoleStore<ApplicationRole, string> roleStore): base(roleStore)
+		{
+		}
+
+		public static ApplicationRoleManager Create(IdentityFactoryOptions<ApplicationRoleManager> options, IOwinContext context)
+		{
+			return new ApplicationRoleManager(new RoleStore<ApplicationRole>(context.Get<PortalDbContext>()));
+		}
+	}
+
+	public class EmailService : IIdentityMessageService
+	{
+		public Task SendAsync(IdentityMessage message)
+		{
+			// Plug in your email service here to send an email.
+			return Task.FromResult(0);
+		}
+	}
+
+	public class SmsService : IIdentityMessageService
+	{
+		public Task SendAsync(IdentityMessage message)
+		{
+			// Plug in your sms service here to send a text message.
+			return Task.FromResult(0);
+		}
+	}
+
+	// Configure the application sign-in manager which is used in this application.
+	public class ApplicationSignInManager : SignInManager<ApplicationUser, string>
+	{
+		public ApplicationSignInManager(ApplicationUserManager userManager, IAuthenticationManager authenticationManager) :
+				base(userManager, authenticationManager)
+		{ }
+
+		public override Task<ClaimsIdentity> CreateUserIdentityAsync(ApplicationUser user)
+		{
+			return user.GenerateUserIdentityAsync((ApplicationUserManager)UserManager);
+		}
+
+		public static ApplicationSignInManager Create(IdentityFactoryOptions<ApplicationSignInManager> options, IOwinContext context)
+		{
+			return new ApplicationSignInManager(context.GetUserManager<ApplicationUserManager>(), context.Authentication);
+		}
+	}
+}
\ No newline at end of file
diff --git a/Portal.CMS.Entities/Entities/Page.cs b/PortalCMS.Entities/Entities/Page.cs
similarity index 95%
rename from Portal.CMS.Entities/Entities/Page.cs
rename to PortalCMS.Entities/Entities/Page.cs
index bd0af0d..ca5cd9e 100644
--- a/Portal.CMS.Entities/Entities/Page.cs
+++ b/PortalCMS.Entities/Entities/Page.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 
-namespace Portal.CMS.Entities.Entities
+namespace PortalCMS.Entities.Entities
 {
     public class Page
     {
diff --git a/Portal.CMS.Entities/Entities/PageAssociation.cs b/PortalCMS.Entities/Entities/PageAssociation.cs
similarity index 95%
rename from Portal.CMS.Entities/Entities/PageAssociation.cs
rename to PortalCMS.Entities/Entities/PageAssociation.cs
index 406f64e..3c0152c 100644
--- a/Portal.CMS.Entities/Entities/PageAssociation.cs
+++ b/PortalCMS.Entities/Entities/PageAssociation.cs
@@ -2,7 +2,7 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Portal.CMS.Entities.Entities
+namespace PortalCMS.Entities.Entities
 {
     public class PageAssociation
     {
diff --git a/Portal.CMS.Entities/Entities/PageAssociationRole.cs b/PortalCMS.Entities/Entities/PageAssociationRole.cs
similarity index 62%
rename from Portal.CMS.Entities/Entities/PageAssociationRole.cs
rename to PortalCMS.Entities/Entities/PageAssociationRole.cs
index 6bbbe22..06fee35 100644
--- a/Portal.CMS.Entities/Entities/PageAssociationRole.cs
+++ b/PortalCMS.Entities/Entities/PageAssociationRole.cs
@@ -1,7 +1,8 @@
-using System.ComponentModel.DataAnnotations;
+using PortalCMS.Entities.Entities.Models;
+using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Portal.CMS.Entities.Entities
+namespace PortalCMS.Entities.Entities
 {
     public class PageAssociationRole
     {
@@ -14,8 +15,8 @@ public class PageAssociationRole
         public virtual PageAssociation PageAssociation { get; set; }
 
         [ForeignKey(nameof(Role))]
-        public int RoleId { get; set; }
+        public string RoleId { get; set; }
 
-        public virtual Role Role { get; set; }
+        public virtual ApplicationRole Role { get; set; }
     }
 }
\ No newline at end of file
diff --git a/Portal.CMS.Entities/Entities/PageComponentType.cs b/PortalCMS.Entities/Entities/PageComponentType.cs
similarity index 83%
rename from Portal.CMS.Entities/Entities/PageComponentType.cs
rename to PortalCMS.Entities/Entities/PageComponentType.cs
index e573373..058998a 100644
--- a/Portal.CMS.Entities/Entities/PageComponentType.cs
+++ b/PortalCMS.Entities/Entities/PageComponentType.cs
@@ -1,7 +1,7 @@
-using Portal.CMS.Entities.Enumerators;
+using PortalCMS.Entities.Enumerators;
 using System.ComponentModel.DataAnnotations;
 
-namespace Portal.CMS.Entities.Entities
+namespace PortalCMS.Entities.Entities
 {
     public class PageComponentType
     {
diff --git a/Portal.CMS.Entities/Entities/PagePartial.cs b/PortalCMS.Entities/Entities/PagePartial.cs
similarity index 93%
rename from Portal.CMS.Entities/Entities/PagePartial.cs
rename to PortalCMS.Entities/Entities/PagePartial.cs
index 759924f..1a2142a 100644
--- a/Portal.CMS.Entities/Entities/PagePartial.cs
+++ b/PortalCMS.Entities/Entities/PagePartial.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 
-namespace Portal.CMS.Entities.Entities
+namespace PortalCMS.Entities.Entities
 {
     public class PagePartial
     {
diff --git a/Portal.CMS.Entities/Entities/PageRole.cs b/PortalCMS.Entities/Entities/PageRole.cs
similarity index 56%
rename from Portal.CMS.Entities/Entities/PageRole.cs
rename to PortalCMS.Entities/Entities/PageRole.cs
index f5784dd..8f9d084 100644
--- a/Portal.CMS.Entities/Entities/PageRole.cs
+++ b/PortalCMS.Entities/Entities/PageRole.cs
@@ -1,7 +1,8 @@
-using System.ComponentModel.DataAnnotations;
+using PortalCMS.Entities.Entities.Models;
+using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Portal.CMS.Entities.Entities
+namespace PortalCMS.Entities.Entities
 {
     public class PageRole
     {
@@ -14,8 +15,8 @@ public class PageRole
         public virtual Page Page { get; set; }
 
         [ForeignKey("Role")]
-        public int RoleId { get; set; }
+        public string RoleId { get; set; }
 
-        public virtual Role Role { get; set; }
+        public virtual ApplicationRole Role { get; set; }
     }
 }
\ No newline at end of file
diff --git a/Portal.CMS.Entities/Entities/PageSection.cs b/PortalCMS.Entities/Entities/PageSection.cs
similarity index 92%
rename from Portal.CMS.Entities/Entities/PageSection.cs
rename to PortalCMS.Entities/Entities/PageSection.cs
index d78f122..6e3394c 100644
--- a/Portal.CMS.Entities/Entities/PageSection.cs
+++ b/PortalCMS.Entities/Entities/PageSection.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 
-namespace Portal.CMS.Entities.Entities
+namespace PortalCMS.Entities.Entities
 {
     public class PageSection
     {
diff --git a/Portal.CMS.Entities/Entities/PageSectionBackup.cs b/PortalCMS.Entities/Entities/PageSectionBackup.cs
similarity index 92%
rename from Portal.CMS.Entities/Entities/PageSectionBackup.cs
rename to PortalCMS.Entities/Entities/PageSectionBackup.cs
index 1066d8d..c884166 100644
--- a/Portal.CMS.Entities/Entities/PageSectionBackup.cs
+++ b/PortalCMS.Entities/Entities/PageSectionBackup.cs
@@ -2,7 +2,7 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Portal.CMS.Entities.Entities
+namespace PortalCMS.Entities.Entities
 {
     public class PageSectionBackup
     {
diff --git a/Portal.CMS.Entities/Entities/PageSectionType.cs b/PortalCMS.Entities/Entities/PageSectionType.cs
similarity index 84%
rename from Portal.CMS.Entities/Entities/PageSectionType.cs
rename to PortalCMS.Entities/Entities/PageSectionType.cs
index fb1e765..1a9b69e 100644
--- a/Portal.CMS.Entities/Entities/PageSectionType.cs
+++ b/PortalCMS.Entities/Entities/PageSectionType.cs
@@ -1,7 +1,7 @@
-using Portal.CMS.Entities.Enumerators;
+using PortalCMS.Entities.Enumerators;
 using System.ComponentModel.DataAnnotations;
 
-namespace Portal.CMS.Entities.Entities
+namespace PortalCMS.Entities.Entities
 {
     public class PageSectionType
     {
diff --git a/Portal.CMS.Entities/Entities/Post.cs b/PortalCMS.Entities/Entities/Post.cs
similarity index 92%
rename from Portal.CMS.Entities/Entities/Post.cs
rename to PortalCMS.Entities/Entities/Post.cs
index c876ac8..3d68196 100644
--- a/Portal.CMS.Entities/Entities/Post.cs
+++ b/PortalCMS.Entities/Entities/Post.cs
@@ -3,7 +3,7 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Portal.CMS.Entities.Entities
+namespace PortalCMS.Entities.Entities
 {
     public class Post
     {
@@ -20,7 +20,7 @@ public class Post
         public string PostBody { get; set; }
 
         [Required]
-        public int PostAuthorUserId { get; set; }
+        public string PostAuthorUserId { get; set; }
 
         [Required]
         public DateTime DateAdded { get; set; }
diff --git a/Portal.CMS.Entities/Entities/PostCategory.cs b/PortalCMS.Entities/Entities/PostCategory.cs
similarity index 89%
rename from Portal.CMS.Entities/Entities/PostCategory.cs
rename to PortalCMS.Entities/Entities/PostCategory.cs
index 00d7831..746d3dd 100644
--- a/Portal.CMS.Entities/Entities/PostCategory.cs
+++ b/PortalCMS.Entities/Entities/PostCategory.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 
-namespace Portal.CMS.Entities.Entities
+namespace PortalCMS.Entities.Entities
 {
     public class PostCategory
     {
diff --git a/Portal.CMS.Entities/Entities/PostComment.cs b/PortalCMS.Entities/Entities/PostComment.cs
similarity index 72%
rename from Portal.CMS.Entities/Entities/PostComment.cs
rename to PortalCMS.Entities/Entities/PostComment.cs
index e323847..1f27c12 100644
--- a/Portal.CMS.Entities/Entities/PostComment.cs
+++ b/PortalCMS.Entities/Entities/PostComment.cs
@@ -1,8 +1,9 @@
-using System;
+using PortalCMS.Entities.Entities.Models;
+using System;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Portal.CMS.Entities.Entities
+namespace PortalCMS.Entities.Entities
 {
     public class PostComment
     {
@@ -11,9 +12,9 @@ public class PostComment
 
         [Required]
         [ForeignKey("User")]
-        public int UserId { get; set; }
+        public string UserId { get; set; }
 
-        public virtual User User { get; set; }
+        public virtual ApplicationUser User { get; set; }
 
         [Required]
         [ForeignKey("Post")]
diff --git a/Portal.CMS.Entities/Entities/PostImage.cs b/PortalCMS.Entities/Entities/PostImage.cs
similarity index 85%
rename from Portal.CMS.Entities/Entities/PostImage.cs
rename to PortalCMS.Entities/Entities/PostImage.cs
index 04032f2..c20849d 100644
--- a/Portal.CMS.Entities/Entities/PostImage.cs
+++ b/PortalCMS.Entities/Entities/PostImage.cs
@@ -1,8 +1,8 @@
-using Portal.CMS.Entities.Enumerators;
+using PortalCMS.Entities.Enumerators;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Portal.CMS.Entities.Entities
+namespace PortalCMS.Entities.Entities
 {
     public class PostImage
     {
diff --git a/PortalCMS.Entities/Entities/PostRole.cs b/PortalCMS.Entities/Entities/PostRole.cs
new file mode 100644
index 0000000..c04cbb7
--- /dev/null
+++ b/PortalCMS.Entities/Entities/PostRole.cs
@@ -0,0 +1,22 @@
+using PortalCMS.Entities.Entities.Models;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace PortalCMS.Entities.Entities
+{
+	public class PostRole
+	{
+		[Key]
+		public int PostRoleId { get; set; }
+
+		[ForeignKey("Post")]
+		public int PostId { get; set; }
+
+		public virtual Post Post { get; set; }
+
+		[ForeignKey("Role")]
+		public string RoleId { get; set; }
+
+		public virtual ApplicationRole Role { get; set; }
+	}
+}
\ No newline at end of file
diff --git a/Portal.CMS.Entities/Entities/Setting.cs b/PortalCMS.Entities/Entities/Setting.cs
similarity index 87%
rename from Portal.CMS.Entities/Entities/Setting.cs
rename to PortalCMS.Entities/Entities/Setting.cs
index 091240d..4a7d7a1 100644
--- a/Portal.CMS.Entities/Entities/Setting.cs
+++ b/PortalCMS.Entities/Entities/Setting.cs
@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace Portal.CMS.Entities.Entities
+namespace PortalCMS.Entities.Entities
 {
     public class Setting
     {
diff --git a/Portal.CMS.Entities/Enumerators/Animation.cs b/PortalCMS.Entities/Enumerators/Animation.cs
similarity index 94%
rename from Portal.CMS.Entities/Enumerators/Animation.cs
rename to PortalCMS.Entities/Enumerators/Animation.cs
index 9b78cfb..02313cb 100644
--- a/Portal.CMS.Entities/Enumerators/Animation.cs
+++ b/PortalCMS.Entities/Enumerators/Animation.cs
@@ -1,4 +1,4 @@
-namespace Portal.CMS.Entities.Enumerators
+namespace PortalCMS.Entities.Enumerators
 {
     public enum Animation
     {
diff --git a/Portal.CMS.Entities/Enumerators/ChartSize.cs b/PortalCMS.Entities/Enumerators/ChartSize.cs
similarity index 75%
rename from Portal.CMS.Entities/Enumerators/ChartSize.cs
rename to PortalCMS.Entities/Enumerators/ChartSize.cs
index 337fc0b..50e7a68 100644
--- a/Portal.CMS.Entities/Enumerators/ChartSize.cs
+++ b/PortalCMS.Entities/Enumerators/ChartSize.cs
@@ -1,4 +1,4 @@
-namespace Portal.CMS.Entities.Enumerators
+namespace PortalCMS.Entities.Enumerators
 {
     public enum ChartSize
     {
diff --git a/Portal.CMS.Entities/Enumerators/ChartType.cs b/PortalCMS.Entities/Enumerators/ChartType.cs
similarity index 74%
rename from Portal.CMS.Entities/Enumerators/ChartType.cs
rename to PortalCMS.Entities/Enumerators/ChartType.cs
index 019ed6a..2127737 100644
--- a/Portal.CMS.Entities/Enumerators/ChartType.cs
+++ b/PortalCMS.Entities/Enumerators/ChartType.cs
@@ -1,4 +1,4 @@
-namespace Portal.CMS.Entities.Enumerators
+namespace PortalCMS.Entities.Enumerators
 {
     public enum ChartType
     {
diff --git a/PortalCMS.Entities/Enumerators/ImageCategory.cs b/PortalCMS.Entities/Enumerators/ImageCategory.cs
new file mode 100644
index 0000000..63a3431
--- /dev/null
+++ b/PortalCMS.Entities/Enumerators/ImageCategory.cs
@@ -0,0 +1,12 @@
+namespace PortalCMS.Entities.Enumerators
+{
+	public enum ImageCategory
+	{
+		General = 0,
+		Icon = 1,
+		Screenshot = 2,
+		Texture = 3,
+		Profile = 4,
+		Logo = 5
+	}
+}
\ No newline at end of file
diff --git a/Portal.CMS.Entities/Enumerators/PageComponentTypeCategory.cs b/PortalCMS.Entities/Enumerators/PageComponentTypeCategory.cs
similarity index 79%
rename from Portal.CMS.Entities/Enumerators/PageComponentTypeCategory.cs
rename to PortalCMS.Entities/Enumerators/PageComponentTypeCategory.cs
index 3cac77b..c624f95 100644
--- a/Portal.CMS.Entities/Enumerators/PageComponentTypeCategory.cs
+++ b/PortalCMS.Entities/Enumerators/PageComponentTypeCategory.cs
@@ -1,4 +1,4 @@
-namespace Portal.CMS.Entities.Enumerators
+namespace PortalCMS.Entities.Enumerators
 {
     public enum PageComponentTypeCategory
     {
diff --git a/Portal.CMS.Entities/Enumerators/PageSectionBackgroundStyle.cs b/PortalCMS.Entities/Enumerators/PageSectionBackgroundStyle.cs
similarity index 68%
rename from Portal.CMS.Entities/Enumerators/PageSectionBackgroundStyle.cs
rename to PortalCMS.Entities/Enumerators/PageSectionBackgroundStyle.cs
index ef49291..5c9c44f 100644
--- a/Portal.CMS.Entities/Enumerators/PageSectionBackgroundStyle.cs
+++ b/PortalCMS.Entities/Enumerators/PageSectionBackgroundStyle.cs
@@ -1,4 +1,4 @@
-namespace Portal.CMS.Entities.Enumerators
+namespace PortalCMS.Entities.Enumerators
 {
     public enum PageSectionBackgroundStyle
     {
diff --git a/Portal.CMS.Entities/Enumerators/PageSectionHeight.cs b/PortalCMS.Entities/Enumerators/PageSectionHeight.cs
similarity index 76%
rename from Portal.CMS.Entities/Enumerators/PageSectionHeight.cs
rename to PortalCMS.Entities/Enumerators/PageSectionHeight.cs
index 74c5520..51e09f4 100644
--- a/Portal.CMS.Entities/Enumerators/PageSectionHeight.cs
+++ b/PortalCMS.Entities/Enumerators/PageSectionHeight.cs
@@ -1,4 +1,4 @@
-namespace Portal.CMS.Entities.Enumerators
+namespace PortalCMS.Entities.Enumerators
 {
     public enum PageSectionHeight
     {
diff --git a/Portal.CMS.Entities/Enumerators/PageSectionTypeCategory.cs b/PortalCMS.Entities/Enumerators/PageSectionTypeCategory.cs
similarity index 74%
rename from Portal.CMS.Entities/Enumerators/PageSectionTypeCategory.cs
rename to PortalCMS.Entities/Enumerators/PageSectionTypeCategory.cs
index ddf4319..13f13d3 100644
--- a/Portal.CMS.Entities/Enumerators/PageSectionTypeCategory.cs
+++ b/PortalCMS.Entities/Enumerators/PageSectionTypeCategory.cs
@@ -1,4 +1,4 @@
-namespace Portal.CMS.Entities.Enumerators
+namespace PortalCMS.Entities.Enumerators
 {
     public enum PageSectionTypeCategory
     {
diff --git a/Portal.CMS.Entities/Enumerators/PostImageType.cs b/PortalCMS.Entities/Enumerators/PostImageType.cs
similarity index 65%
rename from Portal.CMS.Entities/Enumerators/PostImageType.cs
rename to PortalCMS.Entities/Enumerators/PostImageType.cs
index 38301c5..542a115 100644
--- a/Portal.CMS.Entities/Enumerators/PostImageType.cs
+++ b/PortalCMS.Entities/Enumerators/PostImageType.cs
@@ -1,4 +1,4 @@
-namespace Portal.CMS.Entities.Enumerators
+namespace PortalCMS.Entities.Enumerators
 {
     public enum PostImageType
     {
diff --git a/Portal.CMS.Entities/Enumerators/PublicationState.cs b/PortalCMS.Entities/Enumerators/PublicationState.cs
similarity index 66%
rename from Portal.CMS.Entities/Enumerators/PublicationState.cs
rename to PortalCMS.Entities/Enumerators/PublicationState.cs
index bbb24c8..bff9da5 100644
--- a/Portal.CMS.Entities/Enumerators/PublicationState.cs
+++ b/PortalCMS.Entities/Enumerators/PublicationState.cs
@@ -1,4 +1,4 @@
-namespace Portal.CMS.Entities.Enumerators
+namespace PortalCMS.Entities.Enumerators
 {
     public enum PublicationState
     {
diff --git a/PortalCMS.Entities/Enumerators/RecordStatus.cs b/PortalCMS.Entities/Enumerators/RecordStatus.cs
new file mode 100644
index 0000000..c9c68c5
--- /dev/null
+++ b/PortalCMS.Entities/Enumerators/RecordStatus.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace PortalCMS.Entities.Enumerators
+{
+	public enum RecordStatus
+	{
+		Enabled = 0,
+		Suspended = 1,
+		Banned = 2
+	}
+}
diff --git a/Portal.CMS.Entities/Enumerators/TimePeriod.cs b/PortalCMS.Entities/Enumerators/TimePeriod.cs
similarity index 71%
rename from Portal.CMS.Entities/Enumerators/TimePeriod.cs
rename to PortalCMS.Entities/Enumerators/TimePeriod.cs
index b700583..baef2ba 100644
--- a/Portal.CMS.Entities/Enumerators/TimePeriod.cs
+++ b/PortalCMS.Entities/Enumerators/TimePeriod.cs
@@ -1,4 +1,4 @@
-namespace Portal.CMS.Entities.Enumerators
+namespace PortalCMS.Entities.Enumerators
 {
     public enum TimePeriod
     {
diff --git a/Portal.CMS.Entities/Enumerators/UserTokenType.cs b/PortalCMS.Entities/Enumerators/UserTokenType.cs
similarity index 67%
rename from Portal.CMS.Entities/Enumerators/UserTokenType.cs
rename to PortalCMS.Entities/Enumerators/UserTokenType.cs
index 7d321d8..bf50559 100644
--- a/Portal.CMS.Entities/Enumerators/UserTokenType.cs
+++ b/PortalCMS.Entities/Enumerators/UserTokenType.cs
@@ -1,4 +1,4 @@
-namespace Portal.CMS.Entities.Enumerators
+namespace PortalCMS.Entities.Enumerators
 {
     public enum UserTokenType
     {
diff --git a/PortalCMS.Entities/PortalCMS.Entities.csproj b/PortalCMS.Entities/PortalCMS.Entities.csproj
new file mode 100644
index 0000000..ec1cea3
--- /dev/null
+++ b/PortalCMS.Entities/PortalCMS.Entities.csproj
@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{13103A2E-FF04-442F-95F6-C2E8EDB0F274}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>PortalCMS.Entities</RootNamespace>
+    <AssemblyName>PortalCMS.Entities</AssemblyName>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
+      <HintPath>..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.dll</HintPath>
+    </Reference>
+    <Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
+      <HintPath>..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.SqlServer.dll</HintPath>
+    </Reference>
+    <Reference Include="HtmlAgilityPack, Version=1.8.9.0, Culture=neutral, PublicKeyToken=bd319b19eaf3b43a, processorArchitecture=MSIL">
+      <HintPath>..\packages\HtmlAgilityPack.1.8.9\lib\Net45\HtmlAgilityPack.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.AspNet.Identity.Core, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.Identity.Core.2.2.2\lib\net45\Microsoft.AspNet.Identity.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.AspNet.Identity.EntityFramework, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.Identity.EntityFramework.2.2.2\lib\net45\Microsoft.AspNet.Identity.EntityFramework.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.AspNet.Identity.Owin, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.Identity.Owin.2.2.2\lib\net45\Microsoft.AspNet.Identity.Owin.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Owin, Version=4.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Owin.4.0.1\lib\net45\Microsoft.Owin.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Owin.Host.SystemWeb, Version=4.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Owin.Host.SystemWeb.4.0.1\lib\net45\Microsoft.Owin.Host.SystemWeb.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Owin.Security, Version=3.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Owin.Security.3.0.1\lib\net45\Microsoft.Owin.Security.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Owin.Security.Cookies, Version=3.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Owin.Security.Cookies.3.0.1\lib\net45\Microsoft.Owin.Security.Cookies.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Owin.Security.OAuth, Version=3.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Owin.Security.OAuth.3.0.1\lib\net45\Microsoft.Owin.Security.OAuth.dll</HintPath>
+    </Reference>
+    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll</HintPath>
+    </Reference>
+    <Reference Include="Owin, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f0ebd12fd5e55cc5, processorArchitecture=MSIL">
+      <HintPath>..\packages\Owin.1.0\lib\net40\Owin.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.ComponentModel.DataAnnotations" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.Security" />
+    <Reference Include="System.ServiceModel.Activities" />
+    <Reference Include="System.Web" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Entities\AnalyticPageView.cs" />
+    <Compile Include="Entities\AnalyticPostView.cs" />
+    <Compile Include="Entities\Models\FileDetail.cs" />
+    <Compile Include="Entities\Models\IdentityConfig.cs" />
+    <Compile Include="Entities\Models\ApplicationRole.cs" />
+    <Compile Include="Entities\Models\ApplicationUser.cs" />
+    <Compile Include="Enumerators\ChartSize.cs" />
+    <Compile Include="Enumerators\ChartType.cs" />
+    <Compile Include="Enumerators\RecordStatus.cs" />
+    <Compile Include="Enumerators\TimePeriod.cs" />
+    <Compile Include="Enumerators\UserTokenType.cs" />
+    <Compile Include="Entities\CopyItem.cs" />
+    <Compile Include="Entities\Image.cs" />
+    <Compile Include="Enumerators\ImageCategory.cs" />
+    <Compile Include="Enumerators\PublicationState.cs" />
+    <Compile Include="Entities\MenuSystem.cs" />
+    <Compile Include="Entities\MenuItem.cs" />
+    <Compile Include="Entities\MenuItemRole.cs" />
+    <Compile Include="Enumerators\Animation.cs" />
+    <Compile Include="Entities\Page.cs" />
+    <Compile Include="Entities\PageComponentType.cs" />
+    <Compile Include="Entities\PageAssociation.cs" />
+    <Compile Include="Entities\PagePartial.cs" />
+    <Compile Include="Entities\PageSectionBackup.cs" />
+    <Compile Include="Enumerators\PageSectionTypeCategory.cs" />
+    <Compile Include="Enumerators\PageComponentTypeCategory.cs" />
+    <Compile Include="Entities\PageSection.cs" />
+    <Compile Include="Enumerators\PageSectionBackgroundStyle.cs" />
+    <Compile Include="Enumerators\PageSectionHeight.cs" />
+    <Compile Include="Entities\PageSectionType.cs" />
+    <Compile Include="Entities\PageRole.cs" />
+    <Compile Include="Entities\PageAssociationRole.cs" />
+    <Compile Include="Entities\Post.cs" />
+    <Compile Include="Entities\PostCategory.cs" />
+    <Compile Include="Entities\PostComment.cs" />
+    <Compile Include="Entities\PostImage.cs" />
+    <Compile Include="Enumerators\PostImageType.cs" />
+    <Compile Include="Entities\PostRole.cs" />
+    <Compile Include="Entities\Setting.cs" />
+    <Compile Include="Entities\Font.cs" />
+    <Compile Include="Entities\CustomTheme.cs" />
+    <Compile Include="PortalDbContext.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Seed\MediaSeed.cs" />
+    <Compile Include="Seed\MenuSeed.cs" />
+    <Compile Include="Seed\PageComponentTypeSeed.cs" />
+    <Compile Include="Seed\PageSectionTypeSeed.cs" />
+    <Compile Include="Seed\CopySeed.cs" />
+    <Compile Include="Seed\PostSeed.cs" />
+    <Compile Include="Seed\PageSeed.cs" />
+    <Compile Include="Seed\PostCategorySeed.cs" />
+    <Compile Include="Seed\RoleSeed.cs" />
+    <Compile Include="Seed\SettingSeed.cs" />
+    <Compile Include="Seed\ThemeSeed.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="App.config">
+      <SubType>Designer</SubType>
+    </None>
+    <None Include="packages.config">
+      <SubType>Designer</SubType>
+    </None>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file
diff --git a/PortalCMS.Entities/PortalDbContext.cs b/PortalCMS.Entities/PortalDbContext.cs
new file mode 100644
index 0000000..1e1b24e
--- /dev/null
+++ b/PortalCMS.Entities/PortalDbContext.cs
@@ -0,0 +1,100 @@
+using Microsoft.AspNet.Identity.EntityFramework;
+using PortalCMS.Entities.Entities;
+using PortalCMS.Entities.Entities.Models;
+using System.Data.Common;
+using System.Data.Entity;
+using System.Data.Entity.ModelConfiguration.Conventions;
+
+namespace PortalCMS.Entities
+{
+	public class PortalDbContext : IdentityDbContext<ApplicationUser>
+	{
+		#region Dependencies
+
+		public PortalDbContext(DbConnection connection) : base(connection, true)
+		{
+			Database.SetInitializer<PortalDbContext>(null);
+		}
+
+		public PortalDbContext() : base("name=PortalDbConnection")
+		{
+		}
+
+		#endregion Dependencies
+
+		public virtual DbSet<AnalyticPageView> AnalyticPageViews { get; set; }
+
+		public virtual DbSet<AnalyticPostView> AnalyticPostViews { get; set; }
+
+		public virtual DbSet<Post> Posts { get; set; }
+
+		public virtual DbSet<PostCategory> PostCategories { get; set; }
+
+		public virtual DbSet<PostImage> PostImages { get; set; }
+
+		public virtual DbSet<PostComment> PostComments { get; set; }
+
+		public virtual DbSet<PostRole> PostRoles { get; set; }
+
+		public virtual DbSet<Image> Images { get; set; }
+
+		public virtual DbSet<CopyItem> CopyItems { get; set; }
+
+		public virtual DbSet<MenuSystem> Menus { get; set; }
+
+		public virtual DbSet<MenuItem> MenuItems { get; set; }
+
+		public virtual DbSet<MenuItemRole> MenuItemRoles { get; set; }
+
+		public virtual DbSet<Setting> Settings { get; set; }
+
+		public virtual DbSet<Page> Pages { get; set; }
+
+		public virtual DbSet<PageAssociation> PageAssociations { get; set; }
+
+		public virtual DbSet<PageSection> PageSections { get; set; }
+
+		public virtual DbSet<PagePartial> PagePartials { get; set; }
+
+		public virtual DbSet<PageSectionBackup> PageSectionBackups { get; set; }
+
+		public virtual DbSet<PageSectionType> PageSectionTypes { get; set; }
+
+		public virtual DbSet<PageComponentType> PageComponentTypes { get; set; }
+
+		public virtual DbSet<PageRole> PageRoles { get; set; }
+
+		public virtual DbSet<PageAssociationRole> PageAssociationRoles { get; set; }
+
+		public virtual DbSet<Font> Fonts { get; set; }
+
+		public virtual DbSet<CustomTheme> Themes { get; set; }
+
+		protected override void OnModelCreating(DbModelBuilder modelBuilder)
+		{
+			base.OnModelCreating(modelBuilder);
+			modelBuilder.Conventions.Remove<PluralizingTableNameConvention>();
+
+			#region Rename identity tables
+
+			// Add this - so that IdentityUser can share a table with ApplicationUser
+			modelBuilder.Entity<IdentityUser>().ToTable("User");
+			modelBuilder.Entity<ApplicationUser>().ToTable("User");
+
+			// Add this - so that IdentityRole can share a table with ApplicationRole
+			modelBuilder.Entity<IdentityRole>().ToTable("UserRole");
+			modelBuilder.Entity<ApplicationRole>().ToTable("UserRole");
+
+			modelBuilder.Entity<IdentityUserRole>().ToTable("UserRoles");
+			modelBuilder.Entity<IdentityUserLogin>().ToTable("UserLogin");
+			modelBuilder.Entity<IdentityUserClaim>().ToTable("UserClaim");
+
+			#endregion
+		}
+
+		public static PortalDbContext Create()
+		{
+			return new PortalDbContext();
+		}
+	}
+}
\ No newline at end of file
diff --git a/Portal.CMS.Entities/Properties/AssemblyInfo.cs b/PortalCMS.Entities/Properties/AssemblyInfo.cs
similarity index 92%
rename from Portal.CMS.Entities/Properties/AssemblyInfo.cs
rename to PortalCMS.Entities/Properties/AssemblyInfo.cs
index 6261341..4d5ee9d 100644
--- a/Portal.CMS.Entities/Properties/AssemblyInfo.cs
+++ b/PortalCMS.Entities/Properties/AssemblyInfo.cs
@@ -3,11 +3,11 @@
 
 // General Information about an assembly is controlled through the following set of attributes.
 // Change these attribute values to modify the information associated with an assembly.
-[assembly: AssemblyTitle("Portal.CMS.Entities")]
+[assembly: AssemblyTitle("PortalCMS.Entities")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Portal.CMS.Entities")]
+[assembly: AssemblyProduct("PortalCMS.Entities")]
 [assembly: AssemblyCopyright("Copyright ©  2016")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
diff --git a/Portal.CMS.Entities/Seed/CopySeed.cs b/PortalCMS.Entities/Seed/CopySeed.cs
similarity index 94%
rename from Portal.CMS.Entities/Seed/CopySeed.cs
rename to PortalCMS.Entities/Seed/CopySeed.cs
index 5a9fafa..65c4a7f 100644
--- a/Portal.CMS.Entities/Seed/CopySeed.cs
+++ b/PortalCMS.Entities/Seed/CopySeed.cs
@@ -1,13 +1,13 @@
-using Portal.CMS.Entities.Entities;
+using PortalCMS.Entities.Entities;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 
-namespace Portal.CMS.Entities.Seed
+namespace PortalCMS.Entities.Seed
 {
     public static class CopySeed
     {
-        public static void Seed(PortalEntityModel context)
+        public static void Seed(PortalDbContext context)
         {
             var copyList = context.CopyItems.ToList();
             var newCopyList = new List<CopyItem>();
diff --git a/Portal.CMS.Entities/Seed/MediaSeed.cs b/PortalCMS.Entities/Seed/MediaSeed.cs
similarity index 95%
rename from Portal.CMS.Entities/Seed/MediaSeed.cs
rename to PortalCMS.Entities/Seed/MediaSeed.cs
index eebd564..55a397f 100644
--- a/Portal.CMS.Entities/Seed/MediaSeed.cs
+++ b/PortalCMS.Entities/Seed/MediaSeed.cs
@@ -1,13 +1,13 @@
-using Portal.CMS.Entities.Entities;
-using Portal.CMS.Entities.Enumerators;
+using PortalCMS.Entities.Entities;
+using PortalCMS.Entities.Enumerators;
 using System.Collections.Generic;
 using System.Linq;
 
-namespace Portal.CMS.Entities.Seed
+namespace PortalCMS.Entities.Seed
 {
     public static class MediaSeed
     {
-        public static void Seed(PortalEntityModel context)
+        public static void Seed(PortalDbContext context)
         {
             if (!context.Images.Any())
             {
diff --git a/Portal.CMS.Entities/Seed/MenuSeed.cs b/PortalCMS.Entities/Seed/MenuSeed.cs
similarity index 82%
rename from Portal.CMS.Entities/Seed/MenuSeed.cs
rename to PortalCMS.Entities/Seed/MenuSeed.cs
index 28efb74..9c5b7bb 100644
--- a/Portal.CMS.Entities/Seed/MenuSeed.cs
+++ b/PortalCMS.Entities/Seed/MenuSeed.cs
@@ -1,12 +1,12 @@
-using Portal.CMS.Entities.Entities;
+using PortalCMS.Entities.Entities;
 using System.Collections.Generic;
 using System.Linq;
 
-namespace Portal.CMS.Entities.Seed
+namespace PortalCMS.Entities.Seed
 {
     public static class MenuSeed
     {
-        public static void Seed(PortalEntityModel context)
+        public static void Seed(PortalDbContext context)
         {
             if (!context.Menus.Any(x => x.MenuName == "Main Menu"))
             {
diff --git a/Portal.CMS.Entities/Seed/PageComponentTypeSeed.cs b/PortalCMS.Entities/Seed/PageComponentTypeSeed.cs
similarity index 99%
rename from Portal.CMS.Entities/Seed/PageComponentTypeSeed.cs
rename to PortalCMS.Entities/Seed/PageComponentTypeSeed.cs
index 44eca53..bffa3e7 100644
--- a/Portal.CMS.Entities/Seed/PageComponentTypeSeed.cs
+++ b/PortalCMS.Entities/Seed/PageComponentTypeSeed.cs
@@ -1,14 +1,14 @@
 using HtmlAgilityPack;
-using Portal.CMS.Entities.Entities;
-using Portal.CMS.Entities.Enumerators;
+using PortalCMS.Entities.Entities;
+using PortalCMS.Entities.Enumerators;
 using System.Collections.Generic;
 using System.Linq;
 
-namespace Portal.CMS.Entities.Seed
+namespace PortalCMS.Entities.Seed
 {
     public static class PageComponentTypeSeed
     {
-        public static void Seed(PortalEntityModel context)
+        public static void Seed(PortalDbContext context)
         {
             var newComponents = new List<PageComponentType>();
 
diff --git a/Portal.CMS.Entities/Seed/PageSectionTypeSeed.cs b/PortalCMS.Entities/Seed/PageSectionTypeSeed.cs
similarity index 99%
rename from Portal.CMS.Entities/Seed/PageSectionTypeSeed.cs
rename to PortalCMS.Entities/Seed/PageSectionTypeSeed.cs
index 43d6718..38598a5 100644
--- a/Portal.CMS.Entities/Seed/PageSectionTypeSeed.cs
+++ b/PortalCMS.Entities/Seed/PageSectionTypeSeed.cs
@@ -1,15 +1,15 @@
 using HtmlAgilityPack;
-using Portal.CMS.Entities.Entities;
-using Portal.CMS.Entities.Enumerators;
+using PortalCMS.Entities.Entities;
+using PortalCMS.Entities.Enumerators;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text.RegularExpressions;
 
-namespace Portal.CMS.Entities.Seed
+namespace PortalCMS.Entities.Seed
 {
     public static class PageSectionTypeSeed
     {
-        public static void Seed(PortalEntityModel context)
+        public static void Seed(PortalDbContext context)
         {
             var newSections = new List<PageSectionType>();
 
diff --git a/Portal.CMS.Entities/Seed/PageSeed.cs b/PortalCMS.Entities/Seed/PageSeed.cs
similarity index 93%
rename from Portal.CMS.Entities/Seed/PageSeed.cs
rename to PortalCMS.Entities/Seed/PageSeed.cs
index d32a520..b803610 100644
--- a/Portal.CMS.Entities/Seed/PageSeed.cs
+++ b/PortalCMS.Entities/Seed/PageSeed.cs
@@ -1,20 +1,19 @@
-using Portal.CMS.Entities.Entities;
+using PortalCMS.Entities.Entities;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 
-namespace Portal.CMS.Entities.Seed
+namespace PortalCMS.Entities.Seed
 {
     public static class PageSeed
     {
-        public static void Seed(PortalEntityModel context)
+        public static void Seed(PortalDbContext context)
         {
             if (context.Pages.Any())
                 return;
 
             context.Pages.Add(new Page
             {
-                PageId = 1,
                 PageName = "Home",
                 PageController = "Home",
                 PageAction = "Index",
@@ -22,7 +21,7 @@ public static void Seed(PortalEntityModel context)
                 DateUpdated = DateTime.Now,
                 PageAssociations = new List<PageAssociation>
                 {
-                    new PageAssociation { PageSection = new PageSection { PageSectionBody = "<section id=\"section-1\" class=\"header-split background-static height-medium background-picture\" style=\"background-image: url('/Areas/PageBuilder/Content/Images/Sample/sample-2.jpg');background-size: cover;\"> <div id=\"element-2-1491154727776-1\" class=\"details-wrapper\"><div id=\"element-3-1491154727776-1\" class=\"details component-container vertical-alignment\"><div id=\"element-4-1491154727776-1\" class=\"freestyle\"><h1 id=\"element-5-1491154727776-1\" class=\"mce-content-body\" style=\"position: relative; text-align: right;\">PortalCMS 1.3</h1><p id=\"element-6-1491154727776-1\" class=\"mce-content-body\" style=\"position: relative; text-align: right;\">Your website is now ready to use, to start register your first account. The first account registered becomes the owner.</p></div><a id=\"element-8-1491154727776-1\" href=\"/Authentication/Registration/Index\" data-title=\"Register First Account\" class=\"launch-modal btn square\" target=\"\">Register Account</a><a id=\"element-1-1491154800156-1\" href=\"http://www.portalcms.online\" class=\"btn square\" target=\"_blank\">Learn More...</a></div></div><div id=\"element-9-1491154727776-1\" class=\"overlay overlay-light ui-droppable\"></div></section>" },},
+                    new PageAssociation { PageSection = new PageSection { PageSectionBody = "<section id=\"section-1\" class=\"header-split background-static height-medium background-picture\" style=\"background-image: url('/Areas/PageBuilder/Content/Images/Sample/sample-2.jpg');background-size: cover;\"> <div id=\"element-2-1491154727776-1\" class=\"details-wrapper\"><div id=\"element-3-1491154727776-1\" class=\"details component-container vertical-alignment\"><div id=\"element-4-1491154727776-1\" class=\"freestyle\"><h1 id=\"element-5-1491154727776-1\" class=\"mce-content-body\" style=\"position: relative; text-align: right;\">PortalCMS 1.3</h1><p id=\"element-6-1491154727776-1\" class=\"mce-content-body\" style=\"position: relative; text-align: right;\">Your website is now ready to use, to start register your first account. The first account registered becomes the owner.</p></div><a id=\"element-8-1491154727776-1\" href=\"/Authentication/Registration/Index\" data-title=\"Register First Account\" class=\"launch-modal btn square\" target=\"\">Register Account</a></div></div><div id=\"element-9-1491154727776-1\" class=\"overlay overlay-light ui-droppable\"></div></section>" },},
                     new PageAssociation { PageSection = new PageSection { PageSectionBody = "<section id=\"section-2\" class=\"blank height-medium background-static background-colour\" style=\"background-color: #ffffff;\"><div id=\"element-2-1491155804593-2\" class=\"container component-container ui-droppable\"><div id=\"element-3-1491155804593-2\" class=\"freestyle\"><h2 id=\"element-4-1491154890495-6\" class=\"mce-content-body\" style=\"position: relative;\">Getting Started</h2><p id=\"element-5-1491155804593-2\" class=\"mce-content-body\" style=\"position: relative;\">We try to make it as simple to get started&nbsp;as possible, but there will always be a bit of a learning curve. Read on to learn about some quick ways to get started.</p></div></div><div id=\"element-6-1491155804593-2\" class=\"container component-container ui-droppable\"><div id=\"element-7-1491155804593-2\" class=\"row component-container ui-droppable\"><div id=\"element-8-1491155804593-2\" class=\"col-xs-12 col-sm-6 col-md-4 component-container ui-droppable\"><div id=\"element-9-1491155804593-2\" class=\"image image-icon\" style=\"background-image: url('/Areas/PageBuilder/Content/Images/Sample/icon-9.png');\"></div><div id=\"element-10-1491155804593-2\" class=\"freestyle\"><h4 id=\"element-11-1491154890495-6\" class=\"mce-content-body\" style=\"position: relative;\">Add Content</h4><p id=\"element-12-1491154890495-6\" class=\"mce-content-body\" style=\"position: relative;\">The \"Add\" button in the bottom right of your screen allows you to add Sections and Components to your Page</p></div></div><div id=\"element-13-1491155804593-2\" class=\"col-xs-12 col-sm-6 col-md-4 component-container ui-droppable\"><div id=\"element-14-1491155804593-2\" class=\"image image-icon\" style=\"background-image: url('/Areas/PageBuilder/Content/Images/Sample/icon-7.png');\"></div><div id=\"element-15-1491155804593-2\" class=\"freestyle\"><h4 id=\"element-17-1491154890495-6\" class=\"mce-content-body\" style=\"position: relative;\">Edit Content</h4><p id=\"element-18-1491154890495-6\" class=\"mce-content-body\" style=\"position: relative;\">Click on any text or images to change them completely. Or look in the top left of a Section for more controls.</p></div></div><div id=\"element-18-1491155804593-2\" class=\"col-xs-12 col-sm-6 col-md-4 component-container ui-droppable\"><div id=\"element-19-1491155804593-2\" class=\"image image-icon\" style=\"background-image: url('/Areas/PageBuilder/Content/Images/Sample/icon-11.png');\"></div><div id=\"element-20-1491155804593-2\" class=\"freestyle\"><h4 id=\"element-23-1491154890495-6\" class=\"mce-content-body\" style=\"position: relative;\">Write Blog Posts</h4><p id=\"element-24-1491154890495-6\" class=\"mce-content-body\" style=\"position: relative;\">Write a blog Post by clicking \"Add\" in the bottom right of your screen. Or Edit the sample post.</p></div></div><div id=\"element-23-1491155804593-2\" class=\"col-xs-12 col-sm-6 col-md-4 component-container ui-droppable\"><div id=\"element-24-1491155804593-2\" class=\"image image-icon\" style=\"background-image: url('/Areas/PageBuilder/Content/Images/Sample/icon-12.png');\"></div><div id=\"element-25-1491155804593-2\" class=\"freestyle\"><h4 id=\"element-11-1491154890495-6\" class=\"mce-content-body\" style=\"position: relative;\">Use the Admin Panel</h4><p id=\"element-12-1491154890495-6\" class=\"mce-content-body\" style=\"position: relative;\">Click on the Admin Cog in the bottom right of your screen to get into the Admin Panel.</p></div></div><div id=\"element-28-1491155804593-2\" class=\"col-xs-12 col-sm-6 col-md-4 component-container ui-droppable\"><div id=\"element-29-1491155804593-2\" class=\"image image-icon\" style=\"background-image: url('/Areas/PageBuilder/Content/Images/Sample/icon-10.png');\"></div><div id=\"element-30-1491155804593-2\" class=\"freestyle\"><h4 id=\"element-11-1491154890495-6\" class=\"mce-content-body\" style=\"position: relative;\">Upload Media</h4><p id=\"element-12-1491154890495-6\" class=\"mce-content-body\" style=\"position: relative;\">Click on the \"Add\" button in the bottom right of your screen to upload your own Images.</p></div></div><div id=\"element-33-1491155804593-2\" class=\"col-xs-12 col-sm-6 col-md-4 component-container ui-droppable\"><div id=\"element-34-1491155804593-2\" class=\"image image-icon\" style=\"background-image: url('/Areas/PageBuilder/Content/Images/Sample/icon-8.png');\"></div><div id=\"element-35-1491155804593-2\" class=\"freestyle\"><h4 id=\"element-11-1491154890495-6\" class=\"mce-content-body\" style=\"position: relative;\">Delete Content</h4><p id=\"element-12-1491154890495-6\" class=\"mce-content-body\" style=\"position: relative;\">Click on the Cog in the top left of each Section to delete it and start off with a fresh clean Page.</p></div></div></div></div></section>" },},
                 }
             });
diff --git a/Portal.CMS.Entities/Seed/PostCategorySeed.cs b/PortalCMS.Entities/Seed/PostCategorySeed.cs
similarity index 63%
rename from Portal.CMS.Entities/Seed/PostCategorySeed.cs
rename to PortalCMS.Entities/Seed/PostCategorySeed.cs
index 05a0a07..4daec9e 100644
--- a/Portal.CMS.Entities/Seed/PostCategorySeed.cs
+++ b/PortalCMS.Entities/Seed/PostCategorySeed.cs
@@ -1,11 +1,11 @@
-using Portal.CMS.Entities.Entities;
+using PortalCMS.Entities.Entities;
 using System.Linq;
 
-namespace Portal.CMS.Entities.Seed
+namespace PortalCMS.Entities.Seed
 {
     public static class PostCategorySeed
     {
-        public static void Seed(PortalEntityModel context)
+        public static void Seed(PortalDbContext context)
         {
             if (!context.PostCategories.Any())
                 context.PostCategories.Add(new PostCategory { PostCategoryName = "Blog" });
diff --git a/PortalCMS.Entities/Seed/PostSeed.cs b/PortalCMS.Entities/Seed/PostSeed.cs
new file mode 100644
index 0000000..a9e7bda
--- /dev/null
+++ b/PortalCMS.Entities/Seed/PostSeed.cs
@@ -0,0 +1,37 @@
+using PortalCMS.Entities.Entities;
+using PortalCMS.Entities.Enumerators;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace PortalCMS.Entities.Seed
+{
+	public static class PostSeed
+	{
+		public static void Seed(PortalDbContext context)
+		{
+			if (!context.Posts.Any())
+			{
+				var image = context.Images.First(x => x.ImageCategory == ImageCategory.General);
+
+				var firstPost = new Post
+				{
+					PostTitle = "My First Post",
+					PostDescription = "This is just an example post to get you started, why not change it or create a new post?",
+					PostBody = "<p>Coming Soon...</p>",
+					PostAuthorUserId = context.Users.FirstOrDefault().Id,
+					IsPublished = true,
+					DateAdded = DateTime.Now,
+					DateUpdated = DateTime.Now,
+					PostCategoryId = context.PostCategories.First().PostCategoryId,
+					PostImages = new List<PostImage>
+					{
+							new PostImage() { ImageId = image.ImageId, PostImageType = PostImageType.Banner }
+					}
+				};
+
+				context.Posts.Add(firstPost);
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/PortalCMS.Entities/Seed/RoleSeed.cs b/PortalCMS.Entities/Seed/RoleSeed.cs
new file mode 100644
index 0000000..d67c8db
--- /dev/null
+++ b/PortalCMS.Entities/Seed/RoleSeed.cs
@@ -0,0 +1,30 @@
+using Microsoft.AspNet.Identity;
+using Microsoft.AspNet.Identity.EntityFramework;
+using PortalCMS.Entities.Entities.Models;
+
+namespace PortalCMS.Entities.Seed
+{
+	public static class RoleSeed
+	{
+		public static void Seed(PortalDbContext context)
+		{
+			var RoleManager = new ApplicationRoleManager(new RoleStore<ApplicationRole>(context));
+
+			CreateRole(RoleManager, "Admin", true);
+			CreateRole(RoleManager, "Editor", true);
+			CreateRole(RoleManager, "Authenticated", false);
+			CreateRole(RoleManager, "Anonymous", false);
+		}
+
+		private static void CreateRole(ApplicationRoleManager roleManager, string roleName, bool IsAssignable)
+		{
+			var role = roleManager.FindByName(roleName);
+			if (role == null)
+			{
+				role = new ApplicationRole(roleName);
+				role.IsAssignable = IsAssignable;
+				roleManager.Create(role);
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/Portal.CMS.Entities/Seed/SettingSeed.cs b/PortalCMS.Entities/Seed/SettingSeed.cs
similarity index 94%
rename from Portal.CMS.Entities/Seed/SettingSeed.cs
rename to PortalCMS.Entities/Seed/SettingSeed.cs
index 476c70b..8e9cdee 100644
--- a/Portal.CMS.Entities/Seed/SettingSeed.cs
+++ b/PortalCMS.Entities/Seed/SettingSeed.cs
@@ -1,12 +1,12 @@
-using Portal.CMS.Entities.Entities;
+using PortalCMS.Entities.Entities;
 using System.Collections.Generic;
 using System.Linq;
 
-namespace Portal.CMS.Entities.Seed
+namespace PortalCMS.Entities.Seed
 {
     public static class SettingSeed
     {
-        public static void Seed(PortalEntityModel context)
+        public static void Seed(PortalDbContext context)
         {
             var settingList = context.Settings.ToList();
 
diff --git a/Portal.CMS.Entities/Seed/ThemeSeed.cs b/PortalCMS.Entities/Seed/ThemeSeed.cs
similarity index 97%
rename from Portal.CMS.Entities/Seed/ThemeSeed.cs
rename to PortalCMS.Entities/Seed/ThemeSeed.cs
index 88d3b7c..6bbf395 100644
--- a/Portal.CMS.Entities/Seed/ThemeSeed.cs
+++ b/PortalCMS.Entities/Seed/ThemeSeed.cs
@@ -1,13 +1,13 @@
-using Portal.CMS.Entities.Entities;
+using PortalCMS.Entities.Entities;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 
-namespace Portal.CMS.Entities.Seed
+namespace PortalCMS.Entities.Seed
 {
     public static class ThemeSeed
     {
-        public static void Seed(PortalEntityModel context)
+        public static void Seed(PortalDbContext context)
         {
             var fonts = new List<Font>();
 
diff --git a/PortalCMS.Entities/packages.config b/PortalCMS.Entities/packages.config
new file mode 100644
index 0000000..b153b43
--- /dev/null
+++ b/PortalCMS.Entities/packages.config
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="EntityFramework" version="6.2.0" targetFramework="net461" />
+  <package id="HtmlAgilityPack" version="1.8.9" targetFramework="net461" />
+  <package id="Microsoft.AspNet.Identity.Core" version="2.2.2" targetFramework="net461" />
+  <package id="Microsoft.AspNet.Identity.EntityFramework" version="2.2.2" targetFramework="net461" />
+  <package id="Microsoft.AspNet.Identity.Owin" version="2.2.2" targetFramework="net461" />
+  <package id="Microsoft.Owin" version="4.0.1" targetFramework="net461" />
+  <package id="Microsoft.Owin.Host.SystemWeb" version="4.0.1" targetFramework="net461" />
+  <package id="Microsoft.Owin.Security" version="3.0.1" targetFramework="net461" />
+  <package id="Microsoft.Owin.Security.Cookies" version="3.0.1" targetFramework="net461" />
+  <package id="Microsoft.Owin.Security.OAuth" version="3.0.1" targetFramework="net461" />
+  <package id="Newtonsoft.Json" version="6.0.4" targetFramework="net461" />
+  <package id="Owin" version="1.0" targetFramework="net461" />
+</packages>
\ No newline at end of file
diff --git a/PortalCMS.Library/Extensions/StringExtensions.cs b/PortalCMS.Library/Extensions/StringExtensions.cs
new file mode 100644
index 0000000..f444e29
--- /dev/null
+++ b/PortalCMS.Library/Extensions/StringExtensions.cs
@@ -0,0 +1,10 @@
+namespace PortalCMS.Library.ExtensionMethods
+{
+	public static class StringExtensions
+	{
+		public static bool HasValue(this string value)
+		{
+			return !string.IsNullOrEmpty(value);
+		}
+	}
+}
\ No newline at end of file
diff --git a/PortalCMS.Library/PortalCMS.Library.csproj b/PortalCMS.Library/PortalCMS.Library.csproj
new file mode 100644
index 0000000..3fb54a7
--- /dev/null
+++ b/PortalCMS.Library/PortalCMS.Library.csproj
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{C846D9FA-206A-4D28-B6B3-2E5A8DCC31F8}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>PortalCMS.Library</RootNamespace>
+    <AssemblyName>PortalCMS.Library</AssemblyName>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.ComponentModel.DataAnnotations" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Web" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Extensions\StringExtensions.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="ReCaptcha\ReCaptchaValidationResult.cs" />
+    <Compile Include="ReCaptcha\ReCaptchaValidator.cs" />
+    <Compile Include="SessionHandler\SessionHandler.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
\ No newline at end of file
diff --git a/PortalCMS.Library/Properties/AssemblyInfo.cs b/PortalCMS.Library/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..0ef1af8
--- /dev/null
+++ b/PortalCMS.Library/Properties/AssemblyInfo.cs
@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("PortalCMS.Library")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("PortalCMS.Library")]
+[assembly: AssemblyCopyright("Copyright ©  2019")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components.  If you need to access a type in this assembly from
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("c846d9fa-206a-4d28-b6b3-2e5a8dcc31f8")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/PortalCMS.Library/ReCaptcha/ReCaptchaValidationResult.cs b/PortalCMS.Library/ReCaptcha/ReCaptchaValidationResult.cs
new file mode 100644
index 0000000..b81ee6f
--- /dev/null
+++ b/PortalCMS.Library/ReCaptcha/ReCaptchaValidationResult.cs
@@ -0,0 +1,20 @@
+using Newtonsoft.Json;
+using System.Collections.Generic;
+
+namespace PortalCMS.Library.ReCaptcha
+{
+	public class ReCaptchaValidationResult
+	{
+		[JsonProperty("success")]
+		public bool Success { get; set; }
+
+		[JsonProperty("challenge_ts")]
+		public string TimeStamp { get; set; }
+
+		[JsonProperty("hostname")]
+		public string HostName { get; set; }
+
+		[JsonProperty("error-codes")]
+		public List<string> ErrorCodes { get; set; }
+	}
+}
diff --git a/PortalCMS.Library/ReCaptcha/ReCaptchaValidator.cs b/PortalCMS.Library/ReCaptcha/ReCaptchaValidator.cs
new file mode 100644
index 0000000..95eccc8
--- /dev/null
+++ b/PortalCMS.Library/ReCaptcha/ReCaptchaValidator.cs
@@ -0,0 +1,34 @@
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Net.Http;
+using System.Net.Http.Headers;
+
+namespace PortalCMS.Library.ReCaptcha
+{
+	public class ReCaptchaValidator
+	{
+		public static ReCaptchaValidationResult IsValidAsync(string captchaResponse, string secretKey)
+		{
+			if (string.IsNullOrWhiteSpace(captchaResponse) || string.IsNullOrWhiteSpace(secretKey))
+			{
+				return new ReCaptchaValidationResult{ Success = false };
+			}
+
+			HttpClient httpClient = new HttpClient();
+			httpClient.BaseAddress = new Uri("https://www.google.com");
+
+			var values = new List<KeyValuePair<string, string>>();
+			values.Add(new KeyValuePair<string, string>("secret", secretKey));
+			values.Add(new KeyValuePair<string, string> ("response", captchaResponse));
+
+			FormUrlEncodedContent content =	new FormUrlEncodedContent(values);
+			HttpResponseMessage response = httpClient.PostAsync("/recaptcha/api/siteverify", content).Result;
+
+			string verificationResponse = response.Content.ReadAsStringAsync().Result;
+			var verificationResult = JsonConvert.DeserializeObject<ReCaptchaValidationResult>(verificationResponse);
+
+			return verificationResult;
+			}
+	}
+}
diff --git a/PortalCMS.Library/SessionHandler/SessionHandler.cs b/PortalCMS.Library/SessionHandler/SessionHandler.cs
new file mode 100644
index 0000000..0f471ab
--- /dev/null
+++ b/PortalCMS.Library/SessionHandler/SessionHandler.cs
@@ -0,0 +1,42 @@
+using System.Collections.Generic;
+using System.Web;
+
+namespace PortalCMS.Library
+{
+  public class SessionHandler
+  {
+    const string sessionKey = "PortalCMS.Library.SessionHandler";
+    private static Dictionary<string, object> SessionObjects
+    {
+      get
+      {
+        if (HttpContext.Current.Session[sessionKey] == null) { HttpContext.Current.Session[sessionKey] = new Dictionary<string, object>(); }
+
+        return (Dictionary<string, object>)HttpContext.Current.Session[sessionKey];
+      }
+    }
+
+    public static object Get(string itemKey)
+    {
+      return (SessionObjects.ContainsKey(itemKey)) ? SessionObjects[itemKey] : null;
+    }
+
+    public static void Set(string itemKey, object itemValue)
+    {
+      if (SessionObjects.ContainsKey(itemKey))
+      {
+        SessionObjects.Remove(itemKey);
+      }
+
+      SessionObjects.Add(itemKey, itemValue);
+    }
+
+    public static void Remove(string itemKey)
+    {
+      if (Get(itemKey) != null)
+      {
+        SessionObjects.Remove(itemKey);
+      }
+    }
+  }
+}
diff --git a/PortalCMS.Library/packages.config b/PortalCMS.Library/packages.config
new file mode 100644
index 0000000..466ab76
--- /dev/null
+++ b/PortalCMS.Library/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Newtonsoft.Json" version="12.0.1" targetFramework="net461" />
+</packages>
\ No newline at end of file
diff --git a/PortalCMS.Repositories/App.config b/PortalCMS.Repositories/App.config
new file mode 100644
index 0000000..3424b42
--- /dev/null
+++ b/PortalCMS.Repositories/App.config
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <configSections>
+    <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
+    <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false"/>
+  </configSections>
+  <entityFramework>
+    <defaultConnectionFactory type="System.Data.Entity.Infrastructure.LocalDbConnectionFactory, EntityFramework">
+      <parameters>
+        <parameter value="v13.0"/>
+      </parameters>
+    </defaultConnectionFactory>
+    <providers>
+      <provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer"/>
+    </providers>
+  </entityFramework>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0"/>
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/></startup></configuration>
diff --git a/PortalCMS.Repositories/Base/IRepositoryBase.cs b/PortalCMS.Repositories/Base/IRepositoryBase.cs
new file mode 100644
index 0000000..eb4e266
--- /dev/null
+++ b/PortalCMS.Repositories/Base/IRepositoryBase.cs
@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Threading.Tasks;
+
+namespace PortalCMS.Repositories.Base
+{
+	public interface IRepositoryBase<TObject> where TObject : class
+	{
+		TObject Add(TObject t);
+		Task<TObject> AddAsync(TObject t);
+		int Count();
+		Task<int> CountAsync();
+		void Delete(TObject t);
+		Task<int> DeleteAsync(TObject t);
+		TObject Find(Expression<Func<TObject, bool>> match);
+		ICollection<TObject> FindAll(Expression<Func<TObject, bool>> match);
+		Task<ICollection<TObject>> FindAllAsync(Expression<Func<TObject, bool>> match);
+		Task<TObject> FindAsync(Expression<Func<TObject, bool>> match);
+		TObject Get(object id);
+		ICollection<TObject> GetAll();
+		Task<ICollection<TObject>> GetAllAsync();
+		Task<TObject> GetAsync(object id);
+		TObject Update(TObject updated, object key);
+		Task<TObject> UpdateAsync(TObject updated, object key);
+	}
+}
\ No newline at end of file
diff --git a/PortalCMS.Repositories/Base/RepositoryBase.cs b/PortalCMS.Repositories/Base/RepositoryBase.cs
new file mode 100644
index 0000000..403ae5e
--- /dev/null
+++ b/PortalCMS.Repositories/Base/RepositoryBase.cs
@@ -0,0 +1,124 @@
+using PortalCMS.Entities;
+using System;
+using System.Collections.Generic;
+using System.Data.Entity;
+using System.Linq;
+using System.Linq.Expressions;
+using System.Threading.Tasks;
+
+namespace PortalCMS.Repositories.Base
+{
+	public abstract class RepositoryBase<TObject> : IRepositoryBase<TObject> where TObject : class
+	{
+		protected PortalDbContext DbContext;
+
+		public RepositoryBase(PortalDbContext context)
+		{
+			DbContext = context;
+		}
+
+		public ICollection<TObject> GetAll()
+		{
+			return DbContext.Set<TObject>().ToList();
+		}
+
+		public async Task<ICollection<TObject>> GetAllAsync()
+		{
+			return await DbContext.Set<TObject>().ToListAsync();
+		}
+
+		public TObject Get(object id)
+		{
+			return DbContext.Set<TObject>().Find(id);
+		}
+
+		public async Task<TObject> GetAsync(object id)
+		{
+			return await DbContext.Set<TObject>().FindAsync(id);
+		}
+
+		public TObject Find(Expression<Func<TObject, bool>> match)
+		{
+			return DbContext.Set<TObject>().SingleOrDefault(match);
+		}
+
+		public async Task<TObject> FindAsync(Expression<Func<TObject, bool>> match)
+		{
+			return await DbContext.Set<TObject>().SingleOrDefaultAsync(match);
+		}
+
+		public ICollection<TObject> FindAll(Expression<Func<TObject, bool>> match)
+		{
+			return DbContext.Set<TObject>().Where(match).ToList();
+		}
+
+		public async Task<ICollection<TObject>> FindAllAsync(Expression<Func<TObject, bool>> match)
+		{
+			return await DbContext.Set<TObject>().Where(match).ToListAsync();
+		}
+
+		public TObject Add(TObject t)
+		{
+			DbContext.Set<TObject>().Add(t);
+			DbContext.SaveChanges();
+			return t;
+		}
+
+		public async Task<TObject> AddAsync(TObject t)
+		{
+			DbContext.Set<TObject>().Add(t);
+			await DbContext.SaveChangesAsync();
+			return t;
+		}
+
+		public TObject Update(TObject updated, object key)
+		{
+			if (updated == null)
+				return null;
+
+			TObject existing = DbContext.Set<TObject>().Find(key);
+			if (existing != null)
+			{
+				DbContext.Entry(existing).CurrentValues.SetValues(updated);
+				DbContext.SaveChanges();
+			}
+			return existing;
+		}
+
+		public async Task<TObject> UpdateAsync(TObject updated, object key)
+		{
+			if (updated == null)
+				return null;
+
+			TObject existing = await DbContext.Set<TObject>().FindAsync(key);
+			if (existing != null)
+			{
+				DbContext.Entry(existing).CurrentValues.SetValues(updated);
+				await DbContext.SaveChangesAsync();
+			}
+			return existing;
+		}
+
+		public void Delete(TObject t)
+		{
+			DbContext.Set<TObject>().Remove(t);
+			DbContext.SaveChanges();
+		}
+
+		public async Task<int> DeleteAsync(TObject t)
+		{
+			DbContext.Set<TObject>().Remove(t);
+			return await DbContext.SaveChangesAsync();
+		}
+
+		public int Count()
+		{
+			return DbContext.Set<TObject>().Count();
+		}
+
+		public async Task<int> CountAsync()
+		{
+			return await DbContext.Set<TObject>().CountAsync();
+		}
+	}	
+}
diff --git a/PortalCMS.Repositories/PortalCMS.Repositories.csproj b/PortalCMS.Repositories/PortalCMS.Repositories.csproj
new file mode 100644
index 0000000..32bb130
--- /dev/null
+++ b/PortalCMS.Repositories/PortalCMS.Repositories.csproj
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{7DDE9D80-5C8B-4A3A-9193-14DC827BD07C}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>PortalCMS.Repositories</RootNamespace>
+    <AssemblyName>PortalCMS.Repositories</AssemblyName>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
+      <HintPath>..\packages\EntityFramework.6.1.0\lib\net45\EntityFramework.dll</HintPath>
+    </Reference>
+    <Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
+      <HintPath>..\packages\EntityFramework.6.1.0\lib\net45\EntityFramework.SqlServer.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.AspNet.Identity.Core, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.Identity.Core.2.2.2\lib\net45\Microsoft.AspNet.Identity.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.AspNet.Identity.EntityFramework, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.Identity.EntityFramework.2.2.2\lib\net45\Microsoft.AspNet.Identity.EntityFramework.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.ComponentModel.DataAnnotations" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Base\IRepositoryBase.cs" />
+    <Compile Include="Base\RepositoryBase.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\PortalCMS.Entities\PortalCMS.Entities.csproj">
+      <Project>{13103a2e-ff04-442f-95f6-c2e8edb0f274}</Project>
+      <Name>PortalCMS.Entities</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="App.config" />
+    <None Include="packages.config" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
\ No newline at end of file
diff --git a/PortalCMS.Repositories/Properties/AssemblyInfo.cs b/PortalCMS.Repositories/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..9fbe0f2
--- /dev/null
+++ b/PortalCMS.Repositories/Properties/AssemblyInfo.cs
@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("PortalCMS.Repositories")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("PortalCMS.Repositories")]
+[assembly: AssemblyCopyright("Copyright ©  2019")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components.  If you need to access a type in this assembly from
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("7dde9d80-5c8b-4a3a-9193-14dc827bd07c")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/PortalCMS.Repositories/packages.config b/PortalCMS.Repositories/packages.config
new file mode 100644
index 0000000..4a7e3a4
--- /dev/null
+++ b/PortalCMS.Repositories/packages.config
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="EntityFramework" version="6.1.0" targetFramework="net45" />
+  <package id="Microsoft.AspNet.Identity.Core" version="2.2.2" targetFramework="net45" />
+  <package id="Microsoft.AspNet.Identity.EntityFramework" version="2.2.2" targetFramework="net45" />
+</packages>
\ No newline at end of file
diff --git a/Portal.CMS.Services.Tests/App.config b/PortalCMS.Services.Tests/App.config
similarity index 68%
rename from Portal.CMS.Services.Tests/App.config
rename to PortalCMS.Services.Tests/App.config
index f53389f..3766a3b 100644
--- a/Portal.CMS.Services.Tests/App.config
+++ b/PortalCMS.Services.Tests/App.config
@@ -12,4 +12,12 @@
   <startup>
     <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
   </startup>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
 </configuration>
\ No newline at end of file
diff --git a/Portal.CMS.Services.Tests/Authenticated/RoleServiceTests.cs b/PortalCMS.Services.Tests/Authenticated/RoleServiceTests.cs
similarity index 83%
rename from Portal.CMS.Services.Tests/Authenticated/RoleServiceTests.cs
rename to PortalCMS.Services.Tests/Authenticated/RoleServiceTests.cs
index b796192..eaf8e92 100644
--- a/Portal.CMS.Services.Tests/Authenticated/RoleServiceTests.cs
+++ b/PortalCMS.Services.Tests/Authenticated/RoleServiceTests.cs
@@ -14,7 +14,7 @@ public class RoleServiceTests
     {
         #region Dependencies
 
-        private PortalEntityModel _mockContext;
+        private PortalDbContext _mockContext;
 
         private UserService _userService;
         private RoleService _roleService;
@@ -24,7 +24,7 @@ public void Initialise()
         {
             var connection = Effort.DbConnectionFactory.CreateTransient();
 
-            _mockContext = new PortalEntityModel(connection);
+            _mockContext = new PortalDbContext(connection);
             _mockContext.Database.CreateIfNotExists();
 
             _userService = new UserService(_mockContext);
@@ -42,7 +42,7 @@ public async Task GetUserRoles_ReturnsRoles()
 
             _mockContext.Users.AddRange(new List<User>
             {
-                new User { UserId = userId.Value, GivenName = "Test", FamilyName = "User", EmailAddress = "Email", Password = "Password", DateAdded = DateTime.Now, DateUpdated = DateTime.Now }
+                new User { Id = userId.Value, GivenName = "Test", FamilyName = "User", Email = "Email", Password = "Password", DateAdded = DateTime.Now, DateUpdated = DateTime.Now }
             });
 
             _mockContext.SaveChanges();
@@ -57,8 +57,8 @@ public async Task GetUserRoles_ReturnsRoles()
 
             _mockContext.UserRoles.AddRange(new List<UserRole>
             {
-                new UserRole { UserRoleId = 1 , UserId = userId.Value, RoleId = 1 },
-                new UserRole { UserRoleId = 1 , UserId = userId.Value, RoleId = 2 },
+                new UserRole { Id = 1 , UserId = userId.Value, RoleId = 1 },
+                new UserRole { Id = 1 , UserId = userId.Value, RoleId = 2 },
             });
 
             _mockContext.SaveChanges();
@@ -76,7 +76,7 @@ public async Task GetUserRoles_ReturnsCorrectRole()
 
             _mockContext.Users.AddRange(new List<User>
             {
-                new User { UserId = userId.Value, GivenName = "Test", FamilyName = "User", EmailAddress = "Email", Password = "Password", DateAdded = DateTime.Now, DateUpdated = DateTime.Now }
+                new User { Id = userId.Value, GivenName = "Test", FamilyName = "User", Email = "Email", Password = "Password", DateAdded = DateTime.Now, DateUpdated = DateTime.Now }
             });
 
             _mockContext.SaveChanges();
@@ -91,7 +91,7 @@ public async Task GetUserRoles_ReturnsCorrectRole()
 
             var userRoles = new List<UserRole>
             {
-                new UserRole { UserRoleId = 1 , UserId = userId.Value, RoleId = 1 },
+                new UserRole { Id = 1 , UserId = userId.Value, RoleId = 1 },
             };
 
             _mockContext.UserRoles.AddRange(userRoles);
@@ -138,7 +138,7 @@ public async Task Update_RemovesAllRoles()
 
             _mockContext.Users.AddRange(new List<User>
             {
-                new User { UserId = userId.Value, GivenName = "Test", FamilyName = "User", EmailAddress = "Email", Password = "Password", DateAdded = DateTime.Now, DateUpdated = DateTime.Now }
+                new User { Id = userId.Value, GivenName = "Test", FamilyName = "User", Email = "Email", Password = "Password", DateAdded = DateTime.Now, DateUpdated = DateTime.Now }
             });
 
             _mockContext.SaveChanges();
@@ -153,8 +153,8 @@ public async Task Update_RemovesAllRoles()
 
             _mockContext.UserRoles.AddRange(new List<UserRole>
             {
-                new UserRole { UserRoleId = 1 , UserId = userId.Value, RoleId = 1 },
-                new UserRole { UserRoleId = 1 , UserId = userId.Value, RoleId = 2 },
+                new UserRole { Id = 1 , UserId = userId.Value, RoleId = 1 },
+                new UserRole { Id = 1 , UserId = userId.Value, RoleId = 2 },
             });
 
             _mockContext.SaveChanges();
@@ -183,7 +183,7 @@ public async Task Update_AddsAdditionalRole()
 
             _mockContext.Users.AddRange(new List<User>
             {
-                new User { UserId = userId.Value, GivenName = "Test", FamilyName = "User", EmailAddress = "Email", Password = "Password", DateAdded = DateTime.Now, DateUpdated = DateTime.Now }
+                new User { Id = userId.Value, GivenName = "Test", FamilyName = "User", Email = "Email", Password = "Password", DateAdded = DateTime.Now, DateUpdated = DateTime.Now }
             });
 
             _mockContext.SaveChanges();
@@ -198,7 +198,7 @@ public async Task Update_AddsAdditionalRole()
 
             _mockContext.UserRoles.AddRange(new List<UserRole>
             {
-                new UserRole { UserRoleId = 1 , UserId = userId.Value, RoleId = 1 },
+                new UserRole { Id = 1 , UserId = userId.Value, RoleId = 1 },
             });
 
             _mockContext.SaveChanges();
diff --git a/Portal.CMS.Services.Tests/Authenticated/TokenServiceTests.cs b/PortalCMS.Services.Tests/Authenticated/TokenServiceTests.cs
similarity index 84%
rename from Portal.CMS.Services.Tests/Authenticated/TokenServiceTests.cs
rename to PortalCMS.Services.Tests/Authenticated/TokenServiceTests.cs
index d0fa834..14bde07 100644
--- a/Portal.CMS.Services.Tests/Authenticated/TokenServiceTests.cs
+++ b/PortalCMS.Services.Tests/Authenticated/TokenServiceTests.cs
@@ -14,7 +14,7 @@ public class TokenServiceTests
     {
         #region Dependencies
 
-        private PortalEntityModel _mockContext;
+        private PortalDbContext _mockContext;
 
         private UserService _userService;
         private RegistrationService _registrationService;
@@ -25,7 +25,7 @@ public void Initialise()
         {
             var connection = Effort.DbConnectionFactory.CreateTransient();
 
-            _mockContext = new PortalEntityModel(connection);
+            _mockContext = new PortalDbContext(connection);
             _mockContext.Database.CreateIfNotExists();
 
             _userService = new UserService(_mockContext);
@@ -53,7 +53,7 @@ public void RedeemPasswordToken_TokenDoesntMatchEmailAddressReturnsValidation()
 
             _mockContext.Users.AddRange(new List<User>
             {
-                new User { UserId = userId, GivenName = "Test", FamilyName = "User", EmailAddress = "Email", Password = "Password", DateAdded = DateTime.Now, DateUpdated = DateTime.Now }
+                new User { Id = userId, GivenName = "Test", FamilyName = "User", Email = "Email", Password = "Password", DateAdded = DateTime.Now, DateUpdated = DateTime.Now }
             });
 
             _mockContext.UserTokens.AddRange(new List<UserToken>
@@ -76,7 +76,7 @@ public void RedeemPasswordToken_TokenAlreadyUsedReturnsValidation()
 
             _mockContext.Users.AddRange(new List<User>
             {
-                new User { UserId = userId, GivenName = "Test", FamilyName = "User", EmailAddress = "Email", Password = "Password", DateAdded = DateTime.Now, DateUpdated = DateTime.Now }
+                new User { Id = userId, GivenName = "Test", FamilyName = "User", Email = "Email", Password = "Password", DateAdded = DateTime.Now, DateUpdated = DateTime.Now }
             });
 
             _mockContext.UserTokens.AddRange(new List<UserToken>
@@ -99,7 +99,7 @@ public void RedeemPasswordToken_ExecutesWithoutException()
 
             _mockContext.Users.AddRange(new List<User>
             {
-                new User { UserId = userId, GivenName = "Test", FamilyName = "User", EmailAddress = "Email", Password = "Password", DateAdded = DateTime.Now, DateUpdated = DateTime.Now }
+                new User { Id = userId, GivenName = "Test", FamilyName = "User", Email = "Email", Password = "Password", DateAdded = DateTime.Now, DateUpdated = DateTime.Now }
             });
 
             _mockContext.UserTokens.AddRange(new List<UserToken>
@@ -135,7 +135,7 @@ public void RedeemSSOToken_TokenAlreadyUsedReturnsValidation()
 
             _mockContext.Users.AddRange(new List<User>
             {
-                new User { UserId = userId, GivenName = "Test", FamilyName = "User", EmailAddress = "Email", Password = "Password", DateAdded = DateTime.Now, DateUpdated = DateTime.Now }
+                new User { Id = userId, GivenName = "Test", FamilyName = "User", Email = "Email", Password = "Password", DateAdded = DateTime.Now, DateUpdated = DateTime.Now }
             });
 
             _mockContext.UserTokens.AddRange(new List<UserToken>
@@ -158,7 +158,7 @@ public void RedeemSSOToken_ExecutesWithoutException()
 
             _mockContext.Users.AddRange(new List<User>
             {
-                new User { UserId = userId, GivenName = "Test", FamilyName = "User", EmailAddress = "Email", Password = "Password", DateAdded = DateTime.Now, DateUpdated = DateTime.Now }
+                new User { Id = userId, GivenName = "Test", FamilyName = "User", Email = "Email", Password = "Password", DateAdded = DateTime.Now, DateUpdated = DateTime.Now }
             });
 
             _mockContext.UserTokens.AddRange(new List<UserToken>
diff --git a/Portal.CMS.Services.Tests/Portal.CMS.Services.Tests.csproj b/PortalCMS.Services.Tests/Portal.CMS.Services.Tests.csproj
similarity index 96%
rename from Portal.CMS.Services.Tests/Portal.CMS.Services.Tests.csproj
rename to PortalCMS.Services.Tests/Portal.CMS.Services.Tests.csproj
index 6376d86..2e5fd1b 100644
--- a/Portal.CMS.Services.Tests/Portal.CMS.Services.Tests.csproj
+++ b/PortalCMS.Services.Tests/Portal.CMS.Services.Tests.csproj
@@ -78,6 +78,10 @@
       <Project>{13103a2e-ff04-442f-95f6-c2e8edb0f274}</Project>
       <Name>Portal.CMS.Entities</Name>
     </ProjectReference>
+    <ProjectReference Include="..\Portal.CMS.Repositories\Portal.CMS.Repositories.csproj">
+      <Project>{23880390-2164-409d-a02c-8e3b828fbf37}</Project>
+      <Name>Portal.CMS.Repositories</Name>
+    </ProjectReference>
     <ProjectReference Include="..\Portal.CMS.Services\Portal.CMS.Services.csproj">
       <Project>{153c71ed-5f82-4755-aa59-e468b026d4bb}</Project>
       <Name>Portal.CMS.Services</Name>
diff --git a/Portal.CMS.Services.Tests/Properties/AssemblyInfo.cs b/PortalCMS.Services.Tests/Properties/AssemblyInfo.cs
similarity index 100%
rename from Portal.CMS.Services.Tests/Properties/AssemblyInfo.cs
rename to PortalCMS.Services.Tests/Properties/AssemblyInfo.cs
diff --git a/Portal.CMS.Services.Tests/packages.config b/PortalCMS.Services.Tests/packages.config
similarity index 100%
rename from Portal.CMS.Services.Tests/packages.config
rename to PortalCMS.Services.Tests/packages.config
diff --git a/Portal.CMS.Services/Analytics/AnalyticsService.cs b/PortalCMS.Services/Analytics/AnalyticsService.cs
similarity index 95%
rename from Portal.CMS.Services/Analytics/AnalyticsService.cs
rename to PortalCMS.Services/Analytics/AnalyticsService.cs
index a49567f..ee81b01 100644
--- a/Portal.CMS.Services/Analytics/AnalyticsService.cs
+++ b/PortalCMS.Services/Analytics/AnalyticsService.cs
@@ -1,19 +1,19 @@
 using LogBook.Services;
-using Portal.CMS.Entities;
-using Portal.CMS.Entities.Entities;
+using PortalCMS.Entities;
+using PortalCMS.Entities.Entities;
 using System;
 using System.Collections.Generic;
 using System.Data.Entity;
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace Portal.CMS.Services.Analytics
+namespace PortalCMS.Services.Analytics
 {
     public interface IAnalyticsService
     {
-        Task LogPageViewAsync(string area, string controller, string action, string referredUrl, string ipAddress, string userAgent, int? userId);
+        Task LogPageViewAsync(string area, string controller, string action, string referredUrl, string ipAddress, string userAgent, string userId);
 
-        Task LogPostViewAsync(int postId, string referredUrl, string ipAddress, string userAgent, int? UserId);
+        Task LogPostViewAsync(int postId, string referredUrl, string ipAddress, string userAgent, string UserId);
 
         Task<List<KeyValuePair<string, int>>> TotalHitsTodayAsync();
 
@@ -34,16 +34,16 @@ public class AnalyticsService : IAnalyticsService
     {
         #region Dependencies
 
-        private readonly PortalEntityModel _context;
+        private readonly PortalDbContext _context;
 
-        public AnalyticsService(PortalEntityModel context)
+        public AnalyticsService(PortalDbContext context)
         {
             _context = context;
         }
 
         #endregion Dependencies
 
-        public async Task LogPageViewAsync(string area, string controller, string action, string referredUrl, string ipAddress, string userAgent, int? userId)
+        public async Task LogPageViewAsync(string area, string controller, string action, string referredUrl, string ipAddress, string userAgent, string userId)
         {
             var newAnalyticPageView = new AnalyticPageView
             {
@@ -53,7 +53,7 @@ public async Task LogPageViewAsync(string area, string controller, string action
                 ReferredUrl = referredUrl,
                 IPAddress = ipAddress,
                 UserAgent = userAgent,
-                UserId = userId ?? 0,
+                UserId = userId ?? string.Empty,
                 DateAdded = DateTime.Now
             };
 
@@ -62,7 +62,7 @@ public async Task LogPageViewAsync(string area, string controller, string action
             await _context.SaveChangesAsync();
         }
 
-        public async Task LogPostViewAsync(int postId, string referredUrl, string ipAddress, string userAgent, int? UserId)
+        public async Task LogPostViewAsync(int postId, string referredUrl, string ipAddress, string userAgent, string UserId)
         {
             var analyticPostView = new AnalyticPostView
             {
@@ -70,7 +70,7 @@ public async Task LogPostViewAsync(int postId, string referredUrl, string ipAddr
                 ReferredUrl = referredUrl,
                 IPAddress = ipAddress,
                 UserAgent = userAgent,
-                UserId = UserId ?? 0,
+                UserId = UserId ?? string.Empty,
                 DateAdded = DateTime.Now
             };
 
diff --git a/Portal.CMS.Services/App.config b/PortalCMS.Services/App.config
similarity index 71%
rename from Portal.CMS.Services/App.config
rename to PortalCMS.Services/App.config
index 08bf1f3..cce2206 100644
--- a/Portal.CMS.Services/App.config
+++ b/PortalCMS.Services/App.config
@@ -17,4 +17,12 @@
   <startup>
     <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
   </startup>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
 </configuration>
\ No newline at end of file
diff --git a/PortalCMS.Services/Authentication/LoginService.cs b/PortalCMS.Services/Authentication/LoginService.cs
new file mode 100644
index 0000000..5ea83f2
--- /dev/null
+++ b/PortalCMS.Services/Authentication/LoginService.cs
@@ -0,0 +1,29 @@
+using PortalCMS.Entities;
+using System.Threading.Tasks;
+
+namespace PortalCMS.Services.Authentication
+{
+	public class LoginService
+	{
+		#region Dependencies
+
+		readonly PortalDbContext _context;
+
+		public LoginService(PortalDbContext context)
+		{
+			_context = context;
+		}
+
+		#endregion Dependencies
+
+		//public async Task<string> SSOAsync(string userId, string token)
+		//{
+		//	var tokenResult = await _tokenService.RedeemSSOTokenAsync(userId, token);
+
+		//	if (string.IsNullOrWhiteSpace(tokenResult))
+		//		return userId;
+
+		//	return string.Empty;
+		//}
+	}
+}
\ No newline at end of file
diff --git a/PortalCMS.Services/Authentication/RegistrationService.cs b/PortalCMS.Services/Authentication/RegistrationService.cs
new file mode 100644
index 0000000..87c9a39
--- /dev/null
+++ b/PortalCMS.Services/Authentication/RegistrationService.cs
@@ -0,0 +1,93 @@
+using Microsoft.AspNet.Identity.EntityFramework;
+using PortalCMS.Entities;
+using PortalCMS.Entities.Entities.Models;
+using System;
+using System.Data.Entity;
+using System.Threading.Tasks;
+
+namespace PortalCMS.Services.Authentication
+{
+	public interface IRegistrationService
+	{
+		Task<string> RegisterAsync(string emailAddress, string password, string givenName, string familyName, bool emailConfirmed = false);
+
+		Task ChangePasswordAsync(string userId, string newPassword);
+	}
+
+	public class RegistrationService : IRegistrationService
+	{
+		#region Dependencies
+
+		readonly PortalDbContext _context;
+		readonly ApplicationUserManager UserManager;
+		readonly ApplicationRoleManager RoleManager;
+
+		public RegistrationService(PortalDbContext context)
+		{
+			_context = context;
+			UserManager = new ApplicationUserManager(new UserStore<ApplicationUser>(_context));
+			RoleManager = new ApplicationRoleManager(new RoleStore<ApplicationRole>(_context));
+		}
+
+		#endregion Dependencies
+
+		public async Task<string> RegisterAsync(string emailAddress, string password, string givenName, string familyName, bool emailConfirmed = false)
+		{
+			if (await _context.Users.AnyAsync(x => x.Email.Equals(emailAddress, StringComparison.OrdinalIgnoreCase)))
+				return null;
+
+			var userAccount = new ApplicationUser
+			{
+				Email = emailAddress,
+				GivenName = givenName,
+				FamilyName = familyName,
+				AvatarImage = FileDetail.LoadImageFromPath("/Areas/Admin/Content/Images/", "profile-image-male.png"),
+				LastUpdatedDate = DateTime.Now,
+				UserName = GenerateUserName(),
+				RegistrationDate = DateTime.Now,
+				EmailConfirmed = emailConfirmed
+			};
+
+			var result = await UserManager.CreateAsync(userAccount, password);
+			if (!result.Succeeded)
+			{
+				return null;
+			}
+
+			return userAccount.Id;
+		}
+
+		public async Task ChangePasswordAsync(string userId, string newPassword)
+		{
+			var userAccount = await UserManager.FindByIdAsync(userId);
+			if (userAccount == null) return;
+
+			userAccount.LastUpdatedDate = DateTime.Now;
+			userAccount.PasswordHash = UserManager.PasswordHasher.HashPassword(newPassword);
+			await UserManager.UpdateAsync(userAccount);
+		}
+
+		private string  GenerateUserName(int length=10)
+		{
+			string alphabets = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
+			string small_alphabets = "abcdefghijklmnopqrstuvwxyz";
+			string numbers = "1234567890";
+
+			string characters = alphabets + small_alphabets + numbers;
+
+			string userName = string.Empty;
+			for (int i = 0; i < length; i++)
+			{
+				string character = string.Empty;
+				do
+				{
+					int index = new Random().Next(0, characters.Length);
+					character = characters.ToCharArray()[index].ToString();
+				} while (userName.IndexOf(character) != -1);
+				userName += character;
+			}
+
+			return userName;
+		}
+	}
+}
\ No newline at end of file
diff --git a/PortalCMS.Services/Authentication/RoleService.cs b/PortalCMS.Services/Authentication/RoleService.cs
new file mode 100644
index 0000000..7357b91
--- /dev/null
+++ b/PortalCMS.Services/Authentication/RoleService.cs
@@ -0,0 +1,148 @@
+using PortalCMS.Entities;
+using PortalCMS.Entities.Entities.Models;
+using PortalCMS.Repositories.Base;
+using System.Collections.Generic;
+using System.Data.Entity;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace PortalCMS.Services.Authentication
+{
+	public interface IRoleService : IRepositoryBase<ApplicationRole>
+	{
+        Task<IEnumerable<string>> GetByUserAsync(string userId);
+
+        Task<List<ApplicationRole>> GetAsync();
+
+        Task<List<ApplicationRole>> GetUserAssignableRolesAsync();
+
+        Task<string> AddAsync(string roleName);
+
+        Task EditAsync(string roleId, string roleName);
+
+        Task UpdateAsync(string userId, List<string> roleList);
+
+        Task DeleteAsync(string roleId);
+
+        bool Validate(IEnumerable<ApplicationRole> entityRoles, IEnumerable<string> userRoles);
+    }
+
+	public class RoleService : ServiceBase<ApplicationRole>, IRoleService
+	{
+		#region Dependencies
+
+		readonly PortalDbContext _context;
+		readonly IUserService _userService;
+
+		public RoleService(PortalDbContext context, IUserService userService)
+		{
+			_context = context;
+			_userService = userService;
+		}
+
+		#endregion Dependencies
+
+		public async Task<IEnumerable<string>> GetByUserAsync(string userId)
+		{
+			if (!string.IsNullOrEmpty(userId))
+			{
+				var user = await UserManager.FindByIdAsync(userId);
+
+				// get user roles
+				if(user != null)
+				{
+					IList<string> roles = await UserManager.GetRolesAsync(userId);
+					return roles;
+				}
+			}
+
+			return new List<string> { "Anonymous"  };
+		}
+
+		public async Task<List<ApplicationRole>> GetAsync()
+		{
+			var results = await RoleManager.Roles.ToListAsync();
+
+			return results;
+		}
+
+		public async Task<List<ApplicationRole>> GetUserAssignableRolesAsync()
+		{
+			var results = await RoleManager.Roles.Where(x => x.IsAssignable).OrderBy(x => x.Name).ToListAsync();
+
+			return results;
+		}
+
+		public async Task<string> AddAsync(string roleName)
+		{
+			var newRole = new ApplicationRole
+			{
+				Name = roleName
+			};
+
+			_context.Roles.Add(newRole);
+
+			await _context.SaveChangesAsync();
+
+			return newRole.Id;
+		}
+
+		public async Task EditAsync(string roleId, string roleName)
+		{
+			var role = await _context.Roles.SingleOrDefaultAsync(x => x.Id == roleId);
+
+			role.Name = roleName;
+
+			await _context.SaveChangesAsync();
+		}
+
+		public async Task DeleteAsync(string roleId)
+		{
+			var role = await _context.Roles.SingleOrDefaultAsync(x => x.Id == roleId);
+			if (role == null) return;
+
+			_context.Roles.Remove(role);
+
+			await _context.SaveChangesAsync();
+		}
+
+		public async Task UpdateAsync(string userId, List<string> roleList)
+		{
+			var user = await UserManager.FindByIdAsync(userId);
+			if (user == null) return;
+
+			var roles = await UserManager.GetRolesAsync(userId);
+			await UserManager.RemoveFromRolesAsync(userId, roles.ToArray());
+
+			var systemRoles = await RoleManager.Roles.ToListAsync();
+
+			foreach (var role in roleList)
+			{
+				var matchedRole = await RoleManager.FindByNameAsync(role);
+
+				if (matchedRole == null)
+					continue;
+
+				await UserManager.AddToRoleAsync(userId, role);
+			}
+		}
+
+		public bool Validate(IEnumerable<ApplicationRole> entityRoles, IEnumerable<string> userRoles)
+		{
+			// PASS: Where no roles are specified on the entity, access is granted to all users.
+			if (!entityRoles.Any())
+				return true;
+
+			// PASS: Administrators can access any content.
+			if (userRoles.Any(x => x.Equals("Admin", System.StringComparison.OrdinalIgnoreCase)))
+				return true;
+
+			// EVALUATE: Every Role on the Entity. One match grants access.
+			foreach (var role in entityRoles)
+				if (userRoles.Contains(role.Name))
+					return true;
+
+			return false;
+		}
+	}
+}
\ No newline at end of file
diff --git a/PortalCMS.Services/Authentication/UserService.cs b/PortalCMS.Services/Authentication/UserService.cs
new file mode 100644
index 0000000..6530e99
--- /dev/null
+++ b/PortalCMS.Services/Authentication/UserService.cs
@@ -0,0 +1,108 @@
+using PortalCMS.Entities;
+using PortalCMS.Entities.Entities;
+using PortalCMS.Entities.Entities.Models;
+using PortalCMS.Repositories.Base;
+using System;
+using System.Collections.Generic;
+using System.Data.Entity;
+using System.Linq;
+using System.Threading.Tasks;
+using System.Web;
+
+namespace PortalCMS.Services.Authentication
+{
+	public interface IUserService : IRepositoryBase<ApplicationUser>
+	{
+		Task<IEnumerable<ApplicationUser>> GetAsync();
+
+		Task<ApplicationUser> GetByEmailAsync(string emailAddress);
+
+		Task<IEnumerable<ApplicationUser>> GetByRoleAsync(List<string> roleNames);
+
+		Task UpdateDetailsAsync(string userId, string emailAddress, string givenName, string familyName);
+
+		Task UpdateAvatarAsync(string userId, HttpPostedFileBase avatarImage);
+
+		Task UpdateBioAsync(string userId, string bio);
+
+		Task DeleteUserAsync(string userId);
+	}
+
+	public class UserService : ServiceBase<ApplicationUser>, IUserService
+	{
+		#region Dependencies
+
+		public UserService(PortalDbContext context) : base(context) { }
+
+		#endregion Dependencies
+
+		public async Task<ApplicationUser> GetByEmailAsync(string emailAddress)
+		{
+			var result = await base.DbContext.Users.FirstOrDefaultAsync(x => x.Email.Equals(emailAddress, System.StringComparison.OrdinalIgnoreCase));
+
+			return result;
+		}
+
+		public async Task<IEnumerable<ApplicationUser>> GetAsync()
+		{
+			var userList = await base.DbContext.Users.OrderBy(x => x.GivenName).ThenBy(x => x.FamilyName).ThenBy(x => x.Id).ToListAsync();
+
+			return userList;
+		}
+
+		public async Task<IEnumerable<ApplicationUser>> GetByRoleAsync(List<string> roleNames)
+		{
+			var results = new List<ApplicationUser>();
+
+			foreach (var user in UserManager.Users)
+			{
+				foreach (var roleName in roleNames)
+				{
+					if (await UserManager.IsInRoleAsync(user.Id, roleName))
+						results.Add(user);
+				}
+			}
+
+			return results.Distinct().OrderBy(x => x.GivenName).ThenBy(x => x.FamilyName).ThenBy(x => x.Id);
+		}
+
+
+		public async Task UpdateDetailsAsync(string userId, string emailAddress, string givenName, string familyName)
+		{
+			var user = await base.DbContext.Users.SingleOrDefaultAsync(x => x.Id == userId);
+
+			user.Email = emailAddress;
+			user.GivenName = givenName;
+			user.FamilyName = familyName;
+
+			await base.DbContext.SaveChangesAsync();
+		}
+
+		public async Task UpdateAvatarAsync(string userId, HttpPostedFileBase fileUpload)
+		{
+			var user = await base.DbContext.Users.SingleOrDefaultAsync(x => x.Id == userId);
+
+			user.AvatarImage = new FileDetail(fileUpload);
+
+			await base.DbContext.SaveChangesAsync();
+		}
+
+		public async Task UpdateBioAsync(string userId, string bio)
+		{
+			var user = await base.DbContext.Users.SingleOrDefaultAsync(x => x.Id == userId);
+
+			user.Bio = bio;
+
+			await base.DbContext.SaveChangesAsync();
+		}
+
+		public async Task DeleteUserAsync(string userId)
+		{
+			var user = await base.DbContext.Users.SingleOrDefaultAsync(x => x.Id == userId);
+
+			base.DbContext.Users.Remove(user);
+
+			await base.DbContext.SaveChangesAsync();
+		}
+	}
+}
\ No newline at end of file
diff --git a/Portal.CMS.Services/Copy/CopyService.cs b/PortalCMS.Services/Copy/CopyService.cs
similarity index 92%
rename from Portal.CMS.Services/Copy/CopyService.cs
rename to PortalCMS.Services/Copy/CopyService.cs
index 7d41103..037732b 100644
--- a/Portal.CMS.Services/Copy/CopyService.cs
+++ b/PortalCMS.Services/Copy/CopyService.cs
@@ -1,12 +1,12 @@
-using Portal.CMS.Entities;
-using Portal.CMS.Entities.Entities;
+using PortalCMS.Entities;
+using PortalCMS.Entities.Entities;
 using System;
 using System.Collections.Generic;
 using System.Data.Entity;
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace Portal.CMS.Services.Copy
+namespace PortalCMS.Services.Copy
 {
     public interface ICopyService
     {
@@ -27,9 +27,9 @@ public class CopyService : ICopyService
     {
         #region Dependencies
 
-        readonly PortalEntityModel _context;
+        readonly PortalDbContext _context;
 
-        public CopyService(PortalEntityModel context)
+        public CopyService(PortalDbContext context)
         {
             _context = context;
         }
diff --git a/Portal.CMS.Services/Generic/ImageService.cs b/PortalCMS.Services/Generic/ImageService.cs
similarity index 87%
rename from Portal.CMS.Services/Generic/ImageService.cs
rename to PortalCMS.Services/Generic/ImageService.cs
index c065290..368d2a1 100644
--- a/Portal.CMS.Services/Generic/ImageService.cs
+++ b/PortalCMS.Services/Generic/ImageService.cs
@@ -1,12 +1,12 @@
-using Portal.CMS.Entities;
-using Portal.CMS.Entities.Entities;
-using Portal.CMS.Entities.Enumerators;
+using PortalCMS.Entities;
+using PortalCMS.Entities.Entities;
+using PortalCMS.Entities.Enumerators;
 using System.Collections.Generic;
 using System.Data.Entity;
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace Portal.CMS.Services.Generic
+namespace PortalCMS.Services.Generic
 {
     public interface IImageService
     {
@@ -23,9 +23,9 @@ public class ImageService : IImageService
     {
         #region Dependencies
 
-        readonly PortalEntityModel _context;
+        readonly PortalDbContext _context;
 
-        public ImageService(PortalEntityModel context)
+        public ImageService(PortalDbContext context)
         {
             _context = context;
         }
diff --git a/Portal.CMS.Services/Menu/MenuItemService.cs b/PortalCMS.Services/Menu/MenuItemService.cs
similarity index 89%
rename from Portal.CMS.Services/Menu/MenuItemService.cs
rename to PortalCMS.Services/Menu/MenuItemService.cs
index 584aafe..43ace53 100644
--- a/Portal.CMS.Services/Menu/MenuItemService.cs
+++ b/PortalCMS.Services/Menu/MenuItemService.cs
@@ -1,11 +1,11 @@
-using Portal.CMS.Entities;
-using Portal.CMS.Entities.Entities;
+using PortalCMS.Entities;
+using PortalCMS.Entities.Entities;
 using System.Collections.Generic;
 using System.Data.Entity;
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace Portal.CMS.Services.Menu
+namespace PortalCMS.Services.Menu
 {
     public interface IMenuItemService
     {
@@ -24,9 +24,9 @@ public class MenuItemService : IMenuItemService
     {
         #region Dependencies
 
-        readonly PortalEntityModel _context;
+        readonly PortalDbContext _context;
 
-        public MenuItemService(PortalEntityModel context)
+        public MenuItemService(PortalDbContext context)
         {
             _context = context;
         }
@@ -92,11 +92,11 @@ public async Task RolesAsync(int menuItemId, List<string> roleList)
 
             foreach (var roleName in roleList)
             {
-                var currentRole = roles.FirstOrDefault(x => x.RoleName == roleName);
+                var currentRole = roles.FirstOrDefault(x => x.Name == roleName);
 
                 if (currentRole == null) continue;
 
-                _context.MenuItemRoles.Add(new MenuItemRole { MenuItemId = menuItemId, RoleId = currentRole.RoleId });
+                _context.MenuItemRoles.Add(new MenuItemRole { MenuItemId = menuItemId, RoleId = currentRole.Id });
             }
 
             await _context.SaveChangesAsync();
diff --git a/Portal.CMS.Services/Menu/MenuService.cs b/PortalCMS.Services/Menu/MenuService.cs
similarity index 75%
rename from Portal.CMS.Services/Menu/MenuService.cs
rename to PortalCMS.Services/Menu/MenuService.cs
index 477f5fd..a662197 100644
--- a/Portal.CMS.Services/Menu/MenuService.cs
+++ b/PortalCMS.Services/Menu/MenuService.cs
@@ -1,12 +1,12 @@
-using Portal.CMS.Entities;
-using Portal.CMS.Entities.Entities;
-using Portal.CMS.Services.Authentication;
+using PortalCMS.Entities;
+using PortalCMS.Entities.Entities;
+using PortalCMS.Services.Authentication;
 using System.Collections.Generic;
 using System.Data.Entity;
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace Portal.CMS.Services.Menu
+namespace PortalCMS.Services.Menu
 {
     public interface IMenuService
     {
@@ -14,18 +14,18 @@ public interface IMenuService
 
         Task<MenuSystem> GetAsync(int menuId);
 
-        Task<List<MenuItem>> ViewAsync(int? userId, string menuName);
+        Task<List<MenuItem>> ViewAsync(string userId, string menuName);
     }
 
     public class MenuService : IMenuService
     {
         #region Dependencies
 
-        readonly PortalEntityModel _context;
+        readonly PortalDbContext _context;
         readonly IUserService _userService;
         readonly IRoleService _roleService;
 
-        public MenuService(PortalEntityModel context, IUserService userService, IRoleService roleService)
+        public MenuService(PortalDbContext context, IUserService userService, IRoleService roleService)
         {
             _context = context;
             _userService = userService;
@@ -48,13 +48,13 @@ public async Task<MenuSystem> GetAsync(int menuId)
             return result;
         }
 
-        public async Task<List<MenuItem>> ViewAsync(int? userId, string menuName)
+        public async Task<List<MenuItem>> ViewAsync(string userId, string menuName)
         {
             var menu = await _context.Menus.FirstOrDefaultAsync(x => x.MenuName == menuName);
 
             var menuItemList = new List<MenuItem>();
 
-            var userRoleList = await _roleService.GetAsync(userId);
+            var userRoleList = await _roleService.GetByUserAsync(userId);
 
             foreach (var menuItem in menu.MenuItems)
             {
diff --git a/Portal.CMS.Services/PageBuilder/PageAssociationService.cs b/PortalCMS.Services/PageBuilder/PageAssociationService.cs
similarity index 94%
rename from Portal.CMS.Services/PageBuilder/PageAssociationService.cs
rename to PortalCMS.Services/PageBuilder/PageAssociationService.cs
index 421e102..514cac0 100644
--- a/Portal.CMS.Services/PageBuilder/PageAssociationService.cs
+++ b/PortalCMS.Services/PageBuilder/PageAssociationService.cs
@@ -1,12 +1,12 @@
-using Portal.CMS.Entities;
-using Portal.CMS.Entities.Entities;
+using PortalCMS.Entities;
+using PortalCMS.Entities.Entities;
 using System;
 using System.Collections.Generic;
 using System.Data.Entity;
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace Portal.CMS.Services.PageBuilder
+namespace PortalCMS.Services.PageBuilder
 {
     public interface IPageAssociationService
     {
@@ -27,9 +27,9 @@ public class PageAssociationService : IPageAssociationService
     {
         #region Dependencies
 
-        private readonly PortalEntityModel _context;
+        private readonly PortalDbContext _context;
 
-        public PageAssociationService(PortalEntityModel context)
+        public PageAssociationService(PortalDbContext context)
         {
             _context = context;
         }
@@ -97,10 +97,10 @@ public async Task EditRolesAsync(int pageAssociationId, List<string> roleList)
 
             foreach (var roleName in roleList)
             {
-                var currentRole = roles.FirstOrDefault(x => x.RoleName == roleName);
+                var currentRole = roles.FirstOrDefault(x => x.Name == roleName);
                 if (currentRole == null) continue;
 
-                _context.PageAssociationRoles.Add(new PageAssociationRole { PageAssociationId = pageAssociationId, RoleId = currentRole.RoleId });
+                _context.PageAssociationRoles.Add(new PageAssociationRole { PageAssociationId = pageAssociationId, RoleId = currentRole.Id });
             }
 
             await _context.SaveChangesAsync();
diff --git a/Portal.CMS.Services/PageBuilder/PageComponentService.cs b/PortalCMS.Services/PageBuilder/PageComponentService.cs
similarity index 95%
rename from Portal.CMS.Services/PageBuilder/PageComponentService.cs
rename to PortalCMS.Services/PageBuilder/PageComponentService.cs
index d291a3e..1001155 100644
--- a/Portal.CMS.Services/PageBuilder/PageComponentService.cs
+++ b/PortalCMS.Services/PageBuilder/PageComponentService.cs
@@ -1,12 +1,12 @@
-using Portal.CMS.Entities;
-using Portal.CMS.Entities.Entities;
-using Portal.CMS.Services.Shared;
+using PortalCMS.Entities;
+using PortalCMS.Entities.Entities;
+using PortalCMS.Services.Shared;
 using System.Collections.Generic;
 using System.Data.Entity;
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace Portal.CMS.Services.PageBuilder
+namespace PortalCMS.Services.PageBuilder
 {
     public interface IPageComponentService
     {
@@ -31,9 +31,9 @@ public class PageComponentService : IPageComponentService
     {
         #region Dependencies
 
-        readonly PortalEntityModel _context;
+        readonly PortalDbContext _context;
 
-        public PageComponentService(PortalEntityModel context)
+        public PageComponentService(PortalDbContext context)
         {
             _context = context;
         }
diff --git a/Portal.CMS.Services/PageBuilder/PagePartialService.cs b/PortalCMS.Services/PageBuilder/PagePartialService.cs
similarity index 85%
rename from Portal.CMS.Services/PageBuilder/PagePartialService.cs
rename to PortalCMS.Services/PageBuilder/PagePartialService.cs
index aa6a050..c84f307 100644
--- a/Portal.CMS.Services/PageBuilder/PagePartialService.cs
+++ b/PortalCMS.Services/PageBuilder/PagePartialService.cs
@@ -1,10 +1,10 @@
-using Portal.CMS.Entities;
-using Portal.CMS.Entities.Entities;
+using PortalCMS.Entities;
+using PortalCMS.Entities.Entities;
 using System.Data.Entity;
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace Portal.CMS.Services.PageBuilder
+namespace PortalCMS.Services.PageBuilder
 {
     public interface IPagePartialService
     {
@@ -15,9 +15,9 @@ public class PagePartialService : IPagePartialService
     {
         #region Dependencies
 
-        private readonly PortalEntityModel _context;
+        private readonly PortalDbContext _context;
 
-        public PagePartialService(PortalEntityModel context)
+        public PagePartialService(PortalDbContext context)
         {
             _context = context;
         }
diff --git a/Portal.CMS.Services/PageBuilder/PageSectionService.cs b/PortalCMS.Services/PageBuilder/PageSectionService.cs
similarity index 97%
rename from Portal.CMS.Services/PageBuilder/PageSectionService.cs
rename to PortalCMS.Services/PageBuilder/PageSectionService.cs
index 244ade1..edf06e2 100644
--- a/Portal.CMS.Services/PageBuilder/PageSectionService.cs
+++ b/PortalCMS.Services/PageBuilder/PageSectionService.cs
@@ -1,7 +1,7 @@
-using Portal.CMS.Entities;
-using Portal.CMS.Entities.Entities;
-using Portal.CMS.Entities.Enumerators;
-using Portal.CMS.Services.Shared;
+using PortalCMS.Entities;
+using PortalCMS.Entities.Entities;
+using PortalCMS.Entities.Enumerators;
+using PortalCMS.Services.Shared;
 using System;
 using System.Collections.Generic;
 using System.Data.Entity;
@@ -9,7 +9,7 @@
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 
-namespace Portal.CMS.Services.PageBuilder
+namespace PortalCMS.Services.PageBuilder
 {
     public interface IPageSectionService
     {
@@ -50,9 +50,9 @@ public interface IPageSectionService
 
     public class PageSectionService : IPageSectionService
     {
-        private readonly PortalEntityModel _context;
+        private readonly PortalDbContext _context;
 
-        public PageSectionService(PortalEntityModel context)
+        public PageSectionService(PortalDbContext context)
         {
             _context = context;
         }
diff --git a/Portal.CMS.Services/PageBuilder/PageService.cs b/PortalCMS.Services/PageBuilder/PageService.cs
similarity index 86%
rename from Portal.CMS.Services/PageBuilder/PageService.cs
rename to PortalCMS.Services/PageBuilder/PageService.cs
index 5d314ef..d4faf7b 100644
--- a/Portal.CMS.Services/PageBuilder/PageService.cs
+++ b/PortalCMS.Services/PageBuilder/PageService.cs
@@ -1,19 +1,19 @@
-using Portal.CMS.Entities;
-using Portal.CMS.Entities.Entities;
-using Portal.CMS.Services.Authentication;
+using PortalCMS.Entities;
+using PortalCMS.Entities.Entities;
+using PortalCMS.Services.Authentication;
 using System;
 using System.Collections.Generic;
 using System.Data.Entity;
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace Portal.CMS.Services.PageBuilder
+namespace PortalCMS.Services.PageBuilder
 {
     public interface IPageService
     {
         Task<List<Page>> GetAsync();
 
-        Task<Page> ViewAsync(int? userId, int pageId);
+        Task<Page> ViewAsync(string userId, int pageId);
 
         Task<Page> GetAsync(int pageId);
 
@@ -30,10 +30,10 @@ public class PageService : IPageService
     {
         #region Dependencies
 
-        private readonly PortalEntityModel _context;
+        private readonly PortalDbContext _context;
         private readonly IRoleService _roleService;
 
-        public PageService(PortalEntityModel context, IRoleService roleService)
+        public PageService(PortalDbContext context, IRoleService roleService)
         {
             _context = context;
             _roleService = roleService;
@@ -48,14 +48,14 @@ public async Task<List<Page>> GetAsync()
             return results;
         }
 
-        public async Task<Page> ViewAsync(int? userId, int pageId)
+        public async Task<Page> ViewAsync(string userId, int pageId)
         {
             var page = await _context.Pages.Include(x => x.PageAssociations).SingleOrDefaultAsync(x => x.PageId == pageId);
 
             if (!page.PageRoles.Any())
                 return await FilterSectionListAsync(page, userId);
 
-            var userRoles = await _roleService.GetAsync(userId);
+            var userRoles = await _roleService.GetByUserAsync(userId);
 
             var hasAccess = _roleService.Validate(page.PageRoles.Select(x => x.Role), userRoles);
 
@@ -128,12 +128,12 @@ public async Task RolesAsync(int pageId, List<string> roleList)
 
             foreach (var roleName in roleList)
             {
-                var currentRole = roles.FirstOrDefault(x => x.RoleName == roleName);
+                var currentRole = roles.FirstOrDefault(x => x.Name == roleName);
 
                 if (currentRole == null)
                     continue;
 
-                _context.PageRoles.Add(new PageRole { PageId = pageId, RoleId = currentRole.RoleId });
+                _context.PageRoles.Add(new PageRole { PageId = pageId, RoleId = currentRole.Id });
             }
 
             await _context.SaveChangesAsync();
@@ -141,7 +141,7 @@ public async Task RolesAsync(int pageId, List<string> roleList)
 
         #region Private Methods
 
-        private async Task<Page> FilterSectionListAsync(Page page, int? userId)
+        private async Task<Page> FilterSectionListAsync(Page page, string userId)
         {
             for (int loop = 0; loop < page.PageAssociations.Count(); loop += 1)
             {
@@ -149,7 +149,7 @@ private async Task<Page> FilterSectionListAsync(Page page, int? userId)
 
                 if (pageAssociation != null)
                 {
-                    var userRoles = await _roleService.GetAsync(userId);
+                    var userRoles = await _roleService.GetByUserAsync(userId);
 
                     var hasAccess = _roleService.Validate(pageAssociation.PageAssociationRoles.Select(x => x.Role), userRoles);
 
diff --git a/Portal.CMS.Services/Portal.CMS.Services.csproj b/PortalCMS.Services/PortalCMS.Services.csproj
similarity index 56%
rename from Portal.CMS.Services/Portal.CMS.Services.csproj
rename to PortalCMS.Services/PortalCMS.Services.csproj
index 8cbd594..b214ec1 100644
--- a/Portal.CMS.Services/Portal.CMS.Services.csproj
+++ b/PortalCMS.Services/PortalCMS.Services.csproj
@@ -7,8 +7,8 @@
     <ProjectGuid>{153C71ED-5F82-4755-AA59-E468B026D4BB}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Portal.CMS.Services</RootNamespace>
-    <AssemblyName>Portal.CMS.Services</AssemblyName>
+    <RootNamespace>PortalCMS.Services</RootNamespace>
+    <AssemblyName>PortalCMS.Services</AssemblyName>
     <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
@@ -49,13 +49,53 @@
     <Reference Include="LogBook.Services, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\tommcclean.LogBook.1.0.4\lib\net452\LogBook.Services.dll</HintPath>
     </Reference>
+    <Reference Include="Microsoft.AspNet.Identity.Core, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.Identity.Core.2.2.2\lib\net45\Microsoft.AspNet.Identity.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.AspNet.Identity.EntityFramework, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.Identity.EntityFramework.2.2.2\lib\net45\Microsoft.AspNet.Identity.EntityFramework.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.AspNet.Identity.Owin, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.Identity.Owin.2.2.2\lib\net45\Microsoft.AspNet.Identity.Owin.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Owin, Version=4.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Owin.4.0.1\lib\net45\Microsoft.Owin.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Owin.Host.SystemWeb, Version=4.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Owin.Host.SystemWeb.4.0.1\lib\net45\Microsoft.Owin.Host.SystemWeb.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Owin.Security, Version=3.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Owin.Security.3.0.1\lib\net45\Microsoft.Owin.Security.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Owin.Security.Cookies, Version=3.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Owin.Security.Cookies.3.0.1\lib\net45\Microsoft.Owin.Security.Cookies.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Owin.Security.OAuth, Version=3.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Owin.Security.OAuth.3.0.1\lib\net45\Microsoft.Owin.Security.OAuth.dll</HintPath>
+    </Reference>
+    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll</HintPath>
+    </Reference>
     <Reference Include="NMemory, Version=2.0.0.0, Culture=neutral, PublicKeyToken=afc61983f100d280, processorArchitecture=MSIL">
       <HintPath>..\packages\NMemory.2.0.4\lib\net45\NMemory.dll</HintPath>
     </Reference>
+    <Reference Include="Owin, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f0ebd12fd5e55cc5, processorArchitecture=MSIL">
+      <HintPath>..\packages\Owin.1.0\lib\net40\Owin.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Core" />
+    <Reference Include="System.Net.Http.Formatting, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.WebApi.Client.5.2.7\lib\net45\System.Net.Http.Formatting.dll</HintPath>
+    </Reference>
     <Reference Include="System.Transactions" />
+    <Reference Include="System.Web" />
+    <Reference Include="System.Web.Http, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.WebApi.Core.5.2.7\lib\net45\System.Web.Http.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Web.Http.Owin, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.WebApi.Owin.5.2.7\lib\net45\System.Web.Http.Owin.dll</HintPath>
+    </Reference>
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />
@@ -68,8 +108,8 @@
     <Compile Include="Authentication\LoginService.cs" />
     <Compile Include="Authentication\RegistrationService.cs" />
     <Compile Include="Authentication\RoleService.cs" />
-    <Compile Include="Authentication\TokenService.cs" />
     <Compile Include="Authentication\UserService.cs" />
+    <Compile Include="ServiceBase.cs" />
     <Compile Include="Copy\CopyService.cs" />
     <Compile Include="PageBuilder\PageAssociationService.cs" />
     <Compile Include="PageBuilder\PagePartialService.cs" />
@@ -89,18 +129,22 @@
     <Compile Include="Shared\Document.cs" />
     <Compile Include="Themes\ThemeService.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Portal.CMS.Entities\Portal.CMS.Entities.csproj">
-      <Project>{13103A2E-FF04-442F-95F6-C2E8EDB0F274}</Project>
-      <Name>Portal.CMS.Entities</Name>
-    </ProjectReference>
-  </ItemGroup>
   <ItemGroup>
     <None Include="App.config" />
     <None Include="packages.config">
       <SubType>Designer</SubType>
     </None>
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\PortalCMS.Entities\PortalCMS.Entities.csproj">
+      <Project>{13103a2e-ff04-442f-95f6-c2e8edb0f274}</Project>
+      <Name>PortalCMS.Entities</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\PortalCMS.Repositories\PortalCMS.Repositories.csproj">
+      <Project>{7dde9d80-5c8b-4a3a-9193-14dc827bd07c}</Project>
+      <Name>PortalCMS.Repositories</Name>
+    </ProjectReference>
+  </ItemGroup>
   <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/Portal.CMS.Services/Posts/PostCategoryService.cs b/PortalCMS.Services/Posts/PostCategoryService.cs
similarity index 91%
rename from Portal.CMS.Services/Posts/PostCategoryService.cs
rename to PortalCMS.Services/Posts/PostCategoryService.cs
index 39c27a2..660c2d1 100644
--- a/Portal.CMS.Services/Posts/PostCategoryService.cs
+++ b/PortalCMS.Services/Posts/PostCategoryService.cs
@@ -1,11 +1,11 @@
-using Portal.CMS.Entities;
-using Portal.CMS.Entities.Entities;
+using PortalCMS.Entities;
+using PortalCMS.Entities.Entities;
 using System.Collections.Generic;
 using System.Data.Entity;
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace Portal.CMS.Services.Posts
+namespace PortalCMS.Services.Posts
 {
     public interface IPostCategoryService
     {
@@ -22,9 +22,9 @@ public interface IPostCategoryService
 
     public class PostCategoryService : IPostCategoryService
     {
-        private PortalEntityModel _context;
+        private PortalDbContext _context;
 
-        public PostCategoryService(PortalEntityModel context)
+        public PostCategoryService(PortalDbContext context)
         {
             _context = context;
         }
diff --git a/Portal.CMS.Services/Posts/PostCommentService.cs b/PortalCMS.Services/Posts/PostCommentService.cs
similarity index 63%
rename from Portal.CMS.Services/Posts/PostCommentService.cs
rename to PortalCMS.Services/Posts/PostCommentService.cs
index 2def588..bdbc500 100644
--- a/Portal.CMS.Services/Posts/PostCommentService.cs
+++ b/PortalCMS.Services/Posts/PostCommentService.cs
@@ -1,29 +1,29 @@
-using Portal.CMS.Entities;
-using Portal.CMS.Entities.Entities;
+using PortalCMS.Entities;
+using PortalCMS.Entities.Entities;
 using System;
 using System.Threading.Tasks;
 
-namespace Portal.CMS.Services.Posts
+namespace PortalCMS.Services.Posts
 {
     public interface IPostCommentService
     {
-        Task AddAsync(int userId, int postId, string commentBody);
+        Task AddAsync(string userId, int postId, string commentBody);
     }
 
     public class PostCommentService : IPostCommentService
     {
         #region Dependencies
 
-        readonly PortalEntityModel _context;
+        readonly PortalDbContext _context;
 
-        public PostCommentService(PortalEntityModel context)
+        public PostCommentService(PortalDbContext context)
         {
             _context = context;
         }
 
         #endregion Dependencies
 
-        public async Task AddAsync(int userId, int postId, string commentBody)
+        public async Task AddAsync(string userId, int postId, string commentBody)
         {
             var comment = new PostComment
             {
diff --git a/Portal.CMS.Services/Posts/PostImageService.cs b/PortalCMS.Services/Posts/PostImageService.cs
similarity index 83%
rename from Portal.CMS.Services/Posts/PostImageService.cs
rename to PortalCMS.Services/Posts/PostImageService.cs
index 20be643..290265c 100644
--- a/Portal.CMS.Services/Posts/PostImageService.cs
+++ b/PortalCMS.Services/Posts/PostImageService.cs
@@ -1,11 +1,11 @@
-using Portal.CMS.Entities;
-using Portal.CMS.Entities.Entities;
-using Portal.CMS.Entities.Enumerators;
+using PortalCMS.Entities;
+using PortalCMS.Entities.Entities;
+using PortalCMS.Entities.Enumerators;
 using System.Data.Entity;
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace Portal.CMS.Services.Posts
+namespace PortalCMS.Services.Posts
 {
     public interface IPostImageService
     {
@@ -18,9 +18,9 @@ public class PostImageService : IPostImageService
     {
         #region Dependencies
 
-        readonly PortalEntityModel _context;
+        readonly PortalDbContext _context;
 
-        public PostImageService(PortalEntityModel context)
+        public PostImageService(PortalDbContext context)
         {
             _context = context;
         }
diff --git a/PortalCMS.Services/Posts/PostService.cs b/PortalCMS.Services/Posts/PostService.cs
new file mode 100644
index 0000000..feea5ba
--- /dev/null
+++ b/PortalCMS.Services/Posts/PostService.cs
@@ -0,0 +1,279 @@
+using PortalCMS.Entities;
+using PortalCMS.Entities.Entities;
+using PortalCMS.Repositories.Base;
+using PortalCMS.Services.Authentication;
+using System;
+using System.Collections.Generic;
+using System.Data.Entity;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace PortalCMS.Services.Posts
+{
+    public interface IPostService : IRepositoryBase<Post>
+	{
+        Task<Post> ReadSingleAsync(string userId, int postId);
+
+        Task<List<Post>> ListByCategoryAsync(string userId, string postCategoryName);
+
+        Task<Post> GetAsync(int postId);
+
+        Task<List<Post>> GetAsync(string postCategoryName, bool published);
+
+        Task<Post> GetLatestAsync();
+
+        Task<int> CreateAsync(string postTitle, int postCategoryId, string postAuthorUserId, string postDescription, string postBody);
+
+        Task EditAsync(int postId, string postTitle, int postCategoryId, string postAuthorUserId, string postDescription, string postBody);
+
+        Task EditAsync(int postId, string postBody);
+
+        Task DescriptionAsync(int postId, string description);
+
+        Task HeadlineAsync(int postId, string headline);
+
+        Task DeleteAsync(int postId);
+
+        Task PublishAsync(int postId);
+
+        Task DraftAsync(int postId);
+
+        Task RolesAsync(int postId, List<string> roleList);
+    }
+
+	public class PostService : ServiceBase<Post>, IPostService
+	{
+		#region Dependencies
+
+		readonly PortalDbContext _context;
+		readonly IUserService _userService;
+		readonly IRoleService _roleService;
+
+		public PostService(PortalDbContext context, IUserService userService, IRoleService roleService)
+		{
+			_context = context;
+			_userService = userService;
+			_roleService = roleService;
+		}
+
+		#endregion Dependencies
+
+		public async Task<Post> ReadSingleAsync(string userId, int postId)
+		{
+			var post = await _context.Posts.SingleOrDefaultAsync(x => x.PostId == postId && x.IsPublished);
+
+			var userRoles = await _roleService.GetByUserAsync(userId);
+
+			if (_roleService.Validate(post.PostRoles.Select(x => x.Role), userRoles))
+				return post;
+
+			return null;
+		}
+
+		public async Task<List<Post>> ListByCategoryAsync(string userId, string postCategoryName)
+		{
+			var userRoleList = new List<string>();
+			var admin = await RoleManager.FindByNameAsync("Admin");
+			var isAdministrator = false;
+
+			if (!string.IsNullOrEmpty(userId))
+			{
+				var user = await _userService.GetAsync(userId);
+
+				if (user.Roles.Any())
+					userRoleList.AddRange(user.Roles.Select(x => x.RoleId));
+
+				if (user.Roles.Any(x => x.RoleId == admin.Id))
+					isAdministrator = true;
+			}
+
+			var postList = await _context.Posts.Where(x => (postCategoryName == string.Empty || x.PostCategory.PostCategoryName == postCategoryName) && x.IsPublished).ToListAsync();
+
+			var returnList = new List<Post>();
+
+			foreach (var post in postList)
+			{
+				if (isAdministrator)
+				{
+					returnList.Add(post);
+					continue;
+				}
+
+				if (!post.PostRoles.Any())
+				{
+					returnList.Add(post);
+
+					continue;
+				}
+
+				if (userRoleList.Contains(post.PostRoles.SelectMany(x => x.Role.Name)))
+				{
+					returnList.Add(post);
+
+					continue;
+				}
+			}
+
+			return returnList.Distinct().OrderByDescending(x => x.DateUpdated).ThenByDescending(x => x.DateAdded).ToList();
+		}
+
+		public async Task<Post> GetAsync(int postId)
+		{
+			var result = await _context.Posts.Include(x => x.PostComments).SingleOrDefaultAsync(x => x.PostId == postId);
+
+			return result;
+		}
+
+		public async Task<List<Post>> GetAsync(string postCategoryName, bool published)
+		{
+			var results = await _context.Posts.Where(x => (x.PostCategory.PostCategoryName.Equals(postCategoryName, StringComparison.OrdinalIgnoreCase) || postCategoryName == string.Empty) && (published && x.IsPublished || !published)).ToListAsync();
+
+			return results.OrderByDescending(x => x.DateUpdated).ThenByDescending(x => x.PostId).ToList();
+		}
+
+		public async Task<Post> GetLatestAsync()
+		{
+			var result = await _context.Posts.Include(x => x.PostComments).Include(x => x.PostImages).Include(x => x.PostCategory).Where(x => x.IsPublished).OrderByDescending(x => x.DateUpdated).FirstOrDefaultAsync();
+
+			return result;
+		}
+
+		public async Task<int> CreateAsync(string postTitle, int postCategoryId, string postAuthorUserId, string postDescription, string postBody)
+		{
+			var post = new Post
+			{
+				PostTitle = postTitle,
+				PostCategoryId = postCategoryId,
+				PostAuthorUserId = postAuthorUserId,
+				PostDescription = postDescription,
+				PostBody = postBody,
+				DateAdded = DateTime.Now,
+				DateUpdated = DateTime.Now
+			};
+
+			_context.Posts.Add(post);
+
+			await _context.SaveChangesAsync();
+
+			return post.PostId;
+		}
+
+		public async Task EditAsync(int postId, string postTitle, int postCategoryId, string postAuthorUserId, string postDescription, string postBody)
+		{
+			var post = await _context.Posts.SingleOrDefaultAsync(x => x.PostId == postId);
+
+			if (post == null)
+				return;
+
+			post.PostTitle = postTitle;
+			post.PostCategoryId = postCategoryId;
+			post.PostAuthorUserId = postAuthorUserId;
+			post.PostDescription = postDescription;
+			post.PostBody = postBody;
+			post.DateUpdated = DateTime.Now;
+
+			await _context.SaveChangesAsync();
+		}
+
+		public async Task EditAsync(int postId, string postBody)
+		{
+			var post = await _context.Posts.SingleOrDefaultAsync(x => x.PostId == postId);
+
+			if (post == null)
+				return;
+
+			post.PostBody = postBody;
+			post.DateUpdated = DateTime.Now;
+
+			await _context.SaveChangesAsync();
+		}
+
+		public async Task DescriptionAsync(int postId, string description)
+		{
+			var post = await _context.Posts.SingleOrDefaultAsync(x => x.PostId == postId);
+
+			if (post == null)
+				return;
+
+			post.PostDescription = description;
+			post.DateUpdated = DateTime.Now;
+
+			await _context.SaveChangesAsync();
+		}
+
+		public async Task HeadlineAsync(int postId, string headline)
+		{
+			var post = await _context.Posts.SingleOrDefaultAsync(x => x.PostId == postId);
+
+			if (post == null)
+				return;
+
+			post.PostTitle = headline;
+			post.DateUpdated = DateTime.Now;
+
+			await _context.SaveChangesAsync();
+		}
+
+		public async Task DeleteAsync(int postId)
+		{
+			var post = await _context.Posts.SingleOrDefaultAsync(x => x.PostId == postId);
+
+			if (post == null)
+				return;
+
+			_context.Posts.Remove(post);
+
+			await _context.SaveChangesAsync();
+		}
+
+		public async Task PublishAsync(int postId)
+		{
+			var post = await _context.Posts.SingleOrDefaultAsync(x => x.PostId == postId);
+
+			if (post == null)
+				return;
+
+			post.IsPublished = true;
+
+			await _context.SaveChangesAsync();
+		}
+
+		public async Task DraftAsync(int postId)
+		{
+			var post = await _context.Posts.SingleOrDefaultAsync(x => x.PostId == postId);
+
+			if (post == null)
+				return;
+
+			post.IsPublished = false;
+
+			await _context.SaveChangesAsync();
+		}
+
+		public async Task RolesAsync(int postId, List<string> roleList)
+		{
+			var post = await GetAsync(postId);
+
+			if (post == null)
+				return;
+
+			var roles = await _context.Roles.ToListAsync();
+
+			if (post.PostRoles != null)
+				foreach (var role in post.PostRoles.ToList())
+					_context.PostRoles.Remove(role);
+
+			foreach (var roleName in roleList)
+			{
+				var currentRole = roles.FirstOrDefault(x => x.Name == roleName);
+
+				if (currentRole == null)
+					continue;
+
+				_context.PostRoles.Add(new PostRole { PostId = postId, RoleId = currentRole.Id });
+			}
+
+			await _context.SaveChangesAsync();
+		}
+	}
+}
\ No newline at end of file
diff --git a/Portal.CMS.Services/Properties/AssemblyInfo.cs b/PortalCMS.Services/Properties/AssemblyInfo.cs
similarity index 92%
rename from Portal.CMS.Services/Properties/AssemblyInfo.cs
rename to PortalCMS.Services/Properties/AssemblyInfo.cs
index 1097914..e30624b 100644
--- a/Portal.CMS.Services/Properties/AssemblyInfo.cs
+++ b/PortalCMS.Services/Properties/AssemblyInfo.cs
@@ -3,11 +3,11 @@
 
 // General Information about an assembly is controlled through the following set of attributes.
 // Change these attribute values to modify the information associated with an assembly.
-[assembly: AssemblyTitle("Portal.CMS.Services")]
+[assembly: AssemblyTitle("PortalCMS.Services")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Portal.CMS.Services")]
+[assembly: AssemblyProduct("PortalCMS.Services")]
 [assembly: AssemblyCopyright("Copyright ©  2016")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
diff --git a/PortalCMS.Services/ServiceBase.cs b/PortalCMS.Services/ServiceBase.cs
new file mode 100644
index 0000000..db15b3c
--- /dev/null
+++ b/PortalCMS.Services/ServiceBase.cs
@@ -0,0 +1,20 @@
+using Microsoft.AspNet.Identity.EntityFramework;
+using PortalCMS.Entities;
+using PortalCMS.Entities.Entities.Models;
+using PortalCMS.Repositories.Base;
+
+namespace PortalCMS.Services
+{
+	public abstract class ServiceBase<TObject>: RepositoryBase<TObject> where TObject : class
+	{
+		protected ApplicationUserManager UserManager;
+		protected ApplicationRoleManager RoleManager;
+
+		public ServiceBase() : this(new PortalDbContext()){}
+    public ServiceBase(PortalDbContext context):base(context)
+		{
+			UserManager = new ApplicationUserManager(new UserStore<ApplicationUser>(context));
+			RoleManager = new ApplicationRoleManager(new RoleStore<ApplicationRole>(context));
+		}
+	}
+}
\ No newline at end of file
diff --git a/PortalCMS.Services/Settings/SettingService.cs b/PortalCMS.Services/Settings/SettingService.cs
new file mode 100644
index 0000000..615eed7
--- /dev/null
+++ b/PortalCMS.Services/Settings/SettingService.cs
@@ -0,0 +1,50 @@
+using PortalCMS.Entities;
+using PortalCMS.Entities.Entities;
+using System.Data.Entity;
+using System.Threading.Tasks;
+
+namespace PortalCMS.Services.Settings
+{
+    public interface ISettingService
+    {
+        Task<Setting> GetAsync(string settingName);
+
+        Task EditAsync(string settingName, string settingValue);
+    }
+
+	public class SettingService : ISettingService
+	{
+		#region Dependencies
+
+		readonly PortalDbContext _context;
+
+		public SettingService(PortalDbContext context)
+		{
+			_context = context;
+		}
+
+		#endregion Dependencies
+
+		public async Task<Setting> GetAsync(string settingName)
+		{
+			var setting = await _context.Settings.FirstOrDefaultAsync(x => x.SettingName == settingName);
+
+			return setting;
+		}
+
+		public async Task EditAsync(string settingName, string settingValue)
+		{
+			var setting = await _context.Settings.FirstOrDefaultAsync(x => x.SettingName == settingName);
+			if (setting == null)
+			{
+				_context.Settings.Add(new Setting { SettingName = settingName, SettingValue = settingValue });
+			}
+			else
+			{
+				setting.SettingValue = settingValue;
+			}
+
+			await _context.SaveChangesAsync();
+		}
+	}
+}
\ No newline at end of file
diff --git a/Portal.CMS.Services/Shared/Document.cs b/PortalCMS.Services/Shared/Document.cs
similarity index 98%
rename from Portal.CMS.Services/Shared/Document.cs
rename to PortalCMS.Services/Shared/Document.cs
index e72332b..ab57cc9 100644
--- a/Portal.CMS.Services/Shared/Document.cs
+++ b/PortalCMS.Services/Shared/Document.cs
@@ -1,11 +1,11 @@
 using HtmlAgilityPack;
-using Portal.CMS.Entities.Enumerators;
+using PortalCMS.Entities.Enumerators;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text.RegularExpressions;
 
-namespace Portal.CMS.Services.Shared
+namespace PortalCMS.Services.Shared
 {
     public class Document
     {
diff --git a/Portal.CMS.Services/Themes/FontService.cs b/PortalCMS.Services/Themes/FontService.cs
similarity index 89%
rename from Portal.CMS.Services/Themes/FontService.cs
rename to PortalCMS.Services/Themes/FontService.cs
index b3b008c..9c7af30 100644
--- a/Portal.CMS.Services/Themes/FontService.cs
+++ b/PortalCMS.Services/Themes/FontService.cs
@@ -1,12 +1,12 @@
-using Portal.CMS.Entities;
-using Portal.CMS.Entities.Entities;
+using PortalCMS.Entities;
+using PortalCMS.Entities.Entities;
 using System;
 using System.Collections.Generic;
 using System.Data.Entity;
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace Portal.CMS.Services.Themes
+namespace PortalCMS.Services.Themes
 {
     public interface IFontService
     {
@@ -23,9 +23,9 @@ public class FontService : IFontService
     {
         #region Dependencies
 
-        readonly PortalEntityModel _context;
+        readonly PortalDbContext _context;
 
-        public FontService(PortalEntityModel context)
+        public FontService(PortalDbContext context)
         {
             _context = context;
         }
diff --git a/Portal.CMS.Services/Themes/ThemeService.cs b/PortalCMS.Services/Themes/ThemeService.cs
similarity index 94%
rename from Portal.CMS.Services/Themes/ThemeService.cs
rename to PortalCMS.Services/Themes/ThemeService.cs
index 5bb9c5a..1aad2c8 100644
--- a/Portal.CMS.Services/Themes/ThemeService.cs
+++ b/PortalCMS.Services/Themes/ThemeService.cs
@@ -1,13 +1,13 @@
-using Portal.CMS.Entities;
-using Portal.CMS.Entities.Entities;
-using Portal.CMS.Services.PageBuilder;
+using PortalCMS.Entities;
+using PortalCMS.Entities.Entities;
+using PortalCMS.Services.PageBuilder;
 using System;
 using System.Collections.Generic;
 using System.Data.Entity;
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace Portal.CMS.Services.Themes
+namespace PortalCMS.Services.Themes
 {
     public interface IThemeService
     {
@@ -28,10 +28,10 @@ public class ThemeService : IThemeService
     {
         #region Dependencies
 
-        readonly PortalEntityModel _context;
+        readonly PortalDbContext _context;
         readonly IPageService _pageService;
 
-        public ThemeService(PortalEntityModel context, IPageService pageService)
+        public ThemeService(PortalDbContext context, IPageService pageService)
         {
             _context = context;
             _pageService = pageService;
diff --git a/PortalCMS.Services/packages.config b/PortalCMS.Services/packages.config
new file mode 100644
index 0000000..47dd921
--- /dev/null
+++ b/PortalCMS.Services/packages.config
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Effort.EF6" version="1.3.10" targetFramework="net461" />
+  <package id="EntityFramework" version="6.2.0" targetFramework="net461" />
+  <package id="HtmlAgilityPack" version="1.8.9" targetFramework="net461" />
+  <package id="Microsoft.AspNet.Identity.Core" version="2.2.2" targetFramework="net461" />
+  <package id="Microsoft.AspNet.Identity.EntityFramework" version="2.2.2" targetFramework="net461" />
+  <package id="Microsoft.AspNet.Identity.Owin" version="2.2.2" targetFramework="net461" />
+  <package id="Microsoft.AspNet.WebApi.Client" version="5.2.7" targetFramework="net461" />
+  <package id="Microsoft.AspNet.WebApi.Core" version="5.2.7" targetFramework="net461" />
+  <package id="Microsoft.AspNet.WebApi.Owin" version="5.2.7" targetFramework="net461" />
+  <package id="Microsoft.Owin" version="4.0.1" targetFramework="net461" />
+  <package id="Microsoft.Owin.Host.SystemWeb" version="4.0.1" targetFramework="net461" />
+  <package id="Microsoft.Owin.Security" version="3.0.1" targetFramework="net461" />
+  <package id="Microsoft.Owin.Security.Cookies" version="3.0.1" targetFramework="net461" />
+  <package id="Microsoft.Owin.Security.OAuth" version="3.0.1" targetFramework="net461" />
+  <package id="Newtonsoft.Json" version="6.0.4" targetFramework="net461" />
+  <package id="NMemory" version="2.0.4" targetFramework="net461" />
+  <package id="Owin" version="1.0" targetFramework="net461" />
+  <package id="tommcclean.LogBook" version="1.0.4" targetFramework="net461" />
+</packages>
\ No newline at end of file
diff --git a/Portal.CMS.Solution.sln b/PortalCMS.Solution.sln
similarity index 53%
rename from Portal.CMS.Solution.sln
rename to PortalCMS.Solution.sln
index 02dbe32..75db88d 100644
--- a/Portal.CMS.Solution.sln
+++ b/PortalCMS.Solution.sln
@@ -1,14 +1,8 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
+# Visual Studio 15
+VisualStudioVersion = 15.0.27703.2018
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Portal.CMS.Web", "Portal.CMS.Web\Portal.CMS.Web.csproj", "{0AA59984-5211-4C28-91A4-B7DBB71AEFAE}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Portal.CMS.Entities", "Portal.CMS.Entities\Portal.CMS.Entities.csproj", "{13103A2E-FF04-442F-95F6-C2E8EDB0F274}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Portal.CMS.Services", "Portal.CMS.Services\Portal.CMS.Services.csproj", "{153C71ED-5F82-4755-AA59-E468B026D4BB}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{CDDB34D9-DF99-4052-9C28-E260C1CF0C9B}"
 	ProjectSection(SolutionItems) = preProject
 		CHANGELOG-ROADMAP.md = CHANGELOG-ROADMAP.md
@@ -16,7 +10,15 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		README.md = README.md
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Portal.CMS.Services.Tests", "Portal.CMS.Services.Tests\Portal.CMS.Services.Tests.csproj", "{C087F6DF-B459-4DDD-A509-C57E4CDF2BF1}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PortalCMS.Entities", "PortalCMS.Entities\PortalCMS.Entities.csproj", "{13103A2E-FF04-442F-95F6-C2E8EDB0F274}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PortalCMS.Services", "PortalCMS.Services\PortalCMS.Services.csproj", "{153C71ED-5F82-4755-AA59-E468B026D4BB}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PortalCMS.Web", "PortalCMS.Web\PortalCMS.Web.csproj", "{0AA59984-5211-4C28-91A4-B7DBB71AEFAE}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PortalCMS.Library", "PortalCMS.Library\PortalCMS.Library.csproj", "{C846D9FA-206A-4D28-B6B3-2E5A8DCC31F8}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PortalCMS.Repositories", "PortalCMS.Repositories\PortalCMS.Repositories.csproj", "{7DDE9D80-5C8B-4A3A-9193-14DC827BD07C}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -24,10 +26,6 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{0AA59984-5211-4C28-91A4-B7DBB71AEFAE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0AA59984-5211-4C28-91A4-B7DBB71AEFAE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0AA59984-5211-4C28-91A4-B7DBB71AEFAE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0AA59984-5211-4C28-91A4-B7DBB71AEFAE}.Release|Any CPU.Build.0 = Release|Any CPU
 		{13103A2E-FF04-442F-95F6-C2E8EDB0F274}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{13103A2E-FF04-442F-95F6-C2E8EDB0F274}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{13103A2E-FF04-442F-95F6-C2E8EDB0F274}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -36,12 +34,23 @@ Global
 		{153C71ED-5F82-4755-AA59-E468B026D4BB}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{153C71ED-5F82-4755-AA59-E468B026D4BB}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{153C71ED-5F82-4755-AA59-E468B026D4BB}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C087F6DF-B459-4DDD-A509-C57E4CDF2BF1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C087F6DF-B459-4DDD-A509-C57E4CDF2BF1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C087F6DF-B459-4DDD-A509-C57E4CDF2BF1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C087F6DF-B459-4DDD-A509-C57E4CDF2BF1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0AA59984-5211-4C28-91A4-B7DBB71AEFAE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0AA59984-5211-4C28-91A4-B7DBB71AEFAE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0AA59984-5211-4C28-91A4-B7DBB71AEFAE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0AA59984-5211-4C28-91A4-B7DBB71AEFAE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C846D9FA-206A-4D28-B6B3-2E5A8DCC31F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C846D9FA-206A-4D28-B6B3-2E5A8DCC31F8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C846D9FA-206A-4D28-B6B3-2E5A8DCC31F8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C846D9FA-206A-4D28-B6B3-2E5A8DCC31F8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7DDE9D80-5C8B-4A3A-9193-14DC827BD07C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7DDE9D80-5C8B-4A3A-9193-14DC827BD07C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7DDE9D80-5C8B-4A3A-9193-14DC827BD07C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7DDE9D80-5C8B-4A3A-9193-14DC827BD07C}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {5E205765-38ED-4D71-84FF-A098ADA9F8A2}
+	EndGlobalSection
 EndGlobal
diff --git a/PortalCMS.Web/App_Start/BundleConfig.cs b/PortalCMS.Web/App_Start/BundleConfig.cs
new file mode 100644
index 0000000..98ce5b5
--- /dev/null
+++ b/PortalCMS.Web/App_Start/BundleConfig.cs
@@ -0,0 +1,92 @@
+using PortalCMS.Web.Architecture.Helpers;
+using System.Web.Optimization;
+
+namespace PortalCMS.Web
+{
+	public static class BundleConfig
+	{
+		public static void RegisterBundles(BundleCollection bundles)
+		{
+			bundles.UseCdn = true;
+			BundleTable.EnableOptimizations = true;
+
+			var cdnRootAddress = SettingHelper.Get("CDN Address");
+
+			RegisterFramework(bundles, cdnRootAddress);
+			RegisterPlugins(bundles, cdnRootAddress);
+		}
+
+		private static void RegisterFramework(BundleCollection bundles, string cdnRootAddress)
+		{
+			bundles.Add(new ScriptBundle("~/Resources/JavaScript/Framework").Include("~/Content/Scripts/Framework/*.js"));
+			bundles.Add(new StyleBundle("~/Resources/CSS/Framework").Include("~/Content/Styles/Framework/*.css", new CssRewriteUrlTransform()));
+
+			bundles.Add(new ScriptBundle("~/Resources/JavaScript/Framework/Administration").Include("~/Content/Scripts/Administration/*.js"));
+			bundles.Add(new StyleBundle("~/Resources/CSS/Framework/Administration").Include("~/Content/Styles/Administration/*.css", new CssRewriteUrlTransform()));
+
+			bundles.Add(GenerateCDNScriptBundle("~/Resources/JavaScript/Framework/Editor", "/Content/Scripts/Editor/QuickAccess.js", cdnRootAddress));
+			bundles.Add(GenerateCDNStyleBundle("~/Resources/CSS/Framework/Editor", "/Content/Styles/AppDrawers/app-drawers.css", cdnRootAddress));
+
+			bundles.Add(GenerateCDNScriptBundle("~/Plugins/Popover/Scripts/Editable", "/Content/Scripts/EditablePopover/editable.popover.js", cdnRootAddress));
+
+			bundles.Add(GenerateCDNScriptBundle("~/Resources/JavaScript/Plugins/FAQ", "/Content/Scripts/Components/component.expand.js", cdnRootAddress));
+			bundles.Add(GenerateCDNScriptBundle("~/Resources/JavaScript/Plugins/Pagination", "/Content/Scripts/Framework/pagination.js", cdnRootAddress));
+			bundles.Add(GenerateCDNScriptBundle("~/Resources/JavaScript/Plugins/Sliders", "/Content/Scripts/Administration/ThemeManager-Admin.js", cdnRootAddress));
+		}
+
+		private static void RegisterPlugins(BundleCollection bundles, string cdnRootAddress)
+		{
+			bundles.Add(new ScriptBundle("~/Plugins/JQuery/Scripts", "https://code.jquery.com/jquery-2.2.1.min.js").Include("~/Content/Plugins/JQuery/jquery-2.2.1.min.js"));
+			bundles.Add(GenerateCDNScriptBundle("~/Plugins/Touch/Scripts", "/Content/Plugins/JQueryUI/jquery.ui.touch-punch.min.js", cdnRootAddress));
+
+			bundles.Add(new ScriptBundle("~/Plugins/JQueryUI/Scripts", "https://code.jquery.com/ui/1.12.0-beta.1/jquery-ui.min.js").Include("~/Content/Plugins/JQueryUI/jquery.ui.min.js"));
+			bundles.Add(GenerateCDNStyleBundle("~/Plugins/JQueryUI/Styles", "/Content/Plugins/JQueryUI/jquery-ui.min.css", cdnRootAddress));
+
+			bundles.Add(new ScriptBundle("~/Plugins/Bootstrap/Scripts", "https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js").Include("~/Content/Plugins/Bootstrap/bootstrap.min.js"));
+			bundles.Add(new StyleBundle("~/Plugins/Bootstrap/Styles", "https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css").Include("~/Content/Plugins/Bootstrap/bootstrap.min.css", new CssRewriteUrlTransform()));
+
+			bundles.Add(GenerateCDNScriptBundle("~/Plugins/Popover/Scripts", "/Content/Scripts/Popover/initialise.js", cdnRootAddress));
+			bundles.Add(GenerateCDNScriptBundle("~/Plugins/Confirmation/Scripts", "/Content/Plugins/Confirmation/bootstrap-confirmation.min.js", cdnRootAddress));
+
+			bundles.Add(new ScriptBundle("~/Plugins/Spectrum/Scripts").Include("~/Content/Plugins/Spectrum/spectrum.min.js").Include("~/Content/Plugins/Spectrum/initialise.js"));
+			bundles.Add(GenerateCDNStyleBundle("~/Plugins/Spectrum/Styles", "/Content/Plugins/Spectrum/spectrum.css", cdnRootAddress));
+
+			bundles.Add(new ScriptBundle("~/Plugins/C3Graphing/Scripts").Include("~/Content/Plugins/C3Graphing/c3.min.js").Include("~/Content/Plugins/C3Graphing/d3.min.js"));
+			bundles.Add(GenerateCDNStyleBundle("~/Plugins/C3Graphing/Styles", "/Content/Plugins/C3Graphing/c3.min.css", cdnRootAddress));
+
+			bundles.Add(GenerateCDNScriptBundle("~/Plugins/FontAwesome/Scripts", "/Content/Plugins/FontAwesome/fontawesome-iconpicker.min.js", cdnRootAddress));
+			bundles.Add(GenerateCDNStyleBundle("~/Plugins/FontAwesome/Styles", "/Content/Plugins/FontAwesome/font-awesome.min.css", cdnRootAddress));
+			bundles.Add(GenerateCDNStyleBundle("~/Plugins/FontAwesome/Styles/Picker", "/Content/Plugins/FontAwesome/fontawesome-iconpicker.min.css", cdnRootAddress));
+
+			bundles.Add(new ScriptBundle("~/Plugins/FancyBox/Scripts").Include("~/Content/Plugins/FancyBox/jquery.fancybox.js").Include("~/Content/Plugins/FancyBox/jquery.fancybox-thumbs.js").Include("~/Content/Plugins/FancyBox/initialise.js"));
+			bundles.Add(new StyleBundle("~/Plugins/FancyBox/Styles").Include("~/Content/Plugins/FancyBox/*.css", new CssRewriteUrlTransform()));
+
+			bundles.Add(GenerateCDNStyleBundle("~/Plugins/HoverCSS/Styles", "/Content/Plugins/HoverCSS/hover-min.css", cdnRootAddress));
+			bundles.Add(GenerateCDNStyleBundle("~/Plugins/Animate/Styles", "/Content/Plugins/Animate/animate.min.css", cdnRootAddress));
+
+			bundles.Add(GenerateCDNScriptBundle("~/Plugins/ImageSelector/Scripts", "/Content/Plugins/ImageSelector/imageselector.js", cdnRootAddress));
+		}
+
+		private static Bundle GenerateCDNScriptBundle(string bundleName, string filePath, string cdnRootAddress)
+		{
+			if (string.IsNullOrEmpty(cdnRootAddress))
+			{
+				return new ScriptBundle(bundleName).Include($"~{filePath}");
+			}
+
+			return new ScriptBundle(bundleName, $"{cdnRootAddress}{filePath}").Include($"~{filePath}");
+		}
+
+		private static Bundle GenerateCDNStyleBundle(string bundleName, string filePath, string cdnRootAddress)
+		{
+			if (string.IsNullOrEmpty(cdnRootAddress))
+			{
+				return new StyleBundle(bundleName).Include($"~{filePath}");
+			}
+
+			var cdnFilePath = $"{cdnRootAddress}{filePath}";
+
+			return new StyleBundle(bundleName, $"{cdnRootAddress}{filePath}").Include($"~{filePath}");
+		}
+	}
+}
\ No newline at end of file
diff --git a/Portal.CMS.Web/App_Start/RouteConfig.cs b/PortalCMS.Web/App_Start/RouteConfig.cs
similarity index 93%
rename from Portal.CMS.Web/App_Start/RouteConfig.cs
rename to PortalCMS.Web/App_Start/RouteConfig.cs
index 9823939..00638a4 100644
--- a/Portal.CMS.Web/App_Start/RouteConfig.cs
+++ b/PortalCMS.Web/App_Start/RouteConfig.cs
@@ -1,10 +1,10 @@
-using Portal.CMS.Services.PageBuilder;
-using Portal.CMS.Web.Architecture.Helpers;
-using Portal.CMS.Web.DependencyResolution;
+using PortalCMS.Services.PageBuilder;
+using PortalCMS.Web.Architecture.Helpers;
+using PortalCMS.Web.DependencyResolution;
 using System.Web.Mvc;
 using System.Web.Routing;
 
-namespace Portal.CMS.Web
+namespace PortalCMS.Web
 {
     public static class RouteConfig
     {
diff --git a/PortalCMS.Web/App_Start/Startup.Auth.cs b/PortalCMS.Web/App_Start/Startup.Auth.cs
new file mode 100644
index 0000000..c76ae25
--- /dev/null
+++ b/PortalCMS.Web/App_Start/Startup.Auth.cs
@@ -0,0 +1,87 @@
+using System;
+using System.Configuration;
+using Microsoft.AspNet.Identity;
+using Microsoft.AspNet.Identity.Owin;
+using Microsoft.Owin;
+using Microsoft.Owin.Security.Cookies;
+using Owin;
+using Owin.Security.Providers.LinkedIn;
+using PortalCMS.Entities;
+using PortalCMS.Entities.Entities.Models;
+
+namespace PortalCMS.Web
+{
+	public partial class Startup
+	{
+		// For more information on configuring authentication, please visit https://go.microsoft.com/fwlink/?LinkId=301864
+		public void ConfigureAuth(IAppBuilder app)
+		{
+			// Configure the db context, user manager and signin manager to use a single instance per request
+			app.CreatePerOwinContext(PortalDbContext.Create);
+			app.CreatePerOwinContext<ApplicationUserManager>(ApplicationUserManager.Create);
+			app.CreatePerOwinContext<ApplicationRoleManager>(ApplicationRoleManager.Create);
+			app.CreatePerOwinContext<ApplicationSignInManager>(ApplicationSignInManager.Create);
+
+			// Enable the application to use a cookie to store information for the signed in user
+			// and to use a cookie to temporarily store information about a user logging in with a third party login provider
+			// Configure the sign in cookie
+			app.UseCookieAuthentication(new CookieAuthenticationOptions
+			{
+				AuthenticationType = DefaultAuthenticationTypes.ApplicationCookie,
+				LoginPath = new PathString("/Authentication/Login"),
+				Provider = new CookieAuthenticationProvider
+				{
+					// Enables the application to validate the security stamp when the user logs in.
+					// This is a security feature which is used when you change a password or add an external login to your account.  
+					OnValidateIdentity = SecurityStampValidator.OnValidateIdentity<ApplicationUserManager, ApplicationUser>(
+									validateInterval: TimeSpan.FromMinutes(30),
+									regenerateIdentity: (manager, user) => user.GenerateUserIdentityAsync(manager))
+				}
+			});
+			app.UseExternalSignInCookie(DefaultAuthenticationTypes.ExternalCookie);
+
+			// Enables the application to temporarily store user information when they are verifying the second factor in the two-factor authentication process.
+			app.UseTwoFactorSignInCookie(DefaultAuthenticationTypes.TwoFactorCookie, TimeSpan.FromMinutes(5));
+
+			// Enables the application to remember the second login verification factor such as phone or email.
+			// Once you check this option, your second step of verification during the login process will be remembered on the device where you logged in from.
+			// This is similar to the RememberMe option when you log in.
+			app.UseTwoFactorRememberBrowserCookie(DefaultAuthenticationTypes.TwoFactorRememberBrowserCookie);
+
+			// Uncomment the following lines to enable logging in with third party login providers
+			//app.UseMicrosoftAccountAuthentication(
+			//    clientId: "",
+			//    clientSecret: "");
+
+			//app.UseTwitterAuthentication(
+			//   consumerKey: "",
+			//   consumerSecret: "");
+
+			//app.UseFacebookAuthentication(
+			//   appId: "",
+			//   appSecret: "");
+
+			//app.UseGoogleAuthentication(new GoogleOAuth2AuthenticationOptions()
+			//{
+			//    ClientId = "",
+			//    ClientSecret = ""
+			//});
+
+			app.UseLinkedInAuthentication(new LinkedInAuthenticationOptions()
+			{
+				ClientId = ConfigurationManager.AppSettings["Linkedin.ClientID"],
+				ClientSecret = ConfigurationManager.AppSettings["Linkedin.SecretKey"],
+				CallbackPath = new PathString("/LinkedIn/Authenticated"),
+				SignInAsAuthenticationType = DefaultAuthenticationTypes.ExternalCookie,
+
+				Provider = new LinkedInAuthenticationProvider()
+				{
+					OnAuthenticated = async context =>
+					{
+						context.Identity.AddClaim(new System.Security.Claims.Claim("LinkedIn_AccessToken", context.AccessToken));
+					}
+				}
+			});
+		}
+	}
+}
\ No newline at end of file
diff --git a/Portal.CMS.Web/App_Start/StructuremapMvc.cs b/PortalCMS.Web/App_Start/StructuremapMvc.cs
similarity index 89%
rename from Portal.CMS.Web/App_Start/StructuremapMvc.cs
rename to PortalCMS.Web/App_Start/StructuremapMvc.cs
index 426d836..4a3bb5f 100644
--- a/Portal.CMS.Web/App_Start/StructuremapMvc.cs
+++ b/PortalCMS.Web/App_Start/StructuremapMvc.cs
@@ -1,14 +1,14 @@
-using Portal.CMS.Web.App_Start;
+using PortalCMS.Web.App_Start;
 
 using WebActivatorEx;
 
 [assembly: PreApplicationStartMethod(typeof(StructuremapMvc), "Start")]
 [assembly: ApplicationShutdownMethod(typeof(StructuremapMvc), "End")]
 
-namespace Portal.CMS.Web.App_Start
+namespace PortalCMS.Web.App_Start
 {
     using Microsoft.Web.Infrastructure.DynamicModuleHelper;
-    using Portal.CMS.Web.DependencyResolution;
+    using PortalCMS.Web.DependencyResolution;
     using System.Web.Mvc;
 
     public static class StructuremapMvc
diff --git a/Portal.CMS.Web/Architecture/ActionFilters/ActionFilterResponseType.cs b/PortalCMS.Web/Architecture/ActionFilters/ActionFilterResponseType.cs
similarity index 60%
rename from Portal.CMS.Web/Architecture/ActionFilters/ActionFilterResponseType.cs
rename to PortalCMS.Web/Architecture/ActionFilters/ActionFilterResponseType.cs
index 0881e46..8d30ec9 100644
--- a/Portal.CMS.Web/Architecture/ActionFilters/ActionFilterResponseType.cs
+++ b/PortalCMS.Web/Architecture/ActionFilters/ActionFilterResponseType.cs
@@ -1,4 +1,4 @@
-namespace Portal.CMS.Web.Architecture.ActionFilters
+namespace PortalCMS.Web.Architecture.ActionFilters
 {
     public enum ActionFilterResponseType
     {
diff --git a/Portal.CMS.Web/Architecture/ActionFilters/AdminFilter.cs b/PortalCMS.Web/Architecture/ActionFilters/AdminFilter.cs
similarity index 90%
rename from Portal.CMS.Web/Architecture/ActionFilters/AdminFilter.cs
rename to PortalCMS.Web/Architecture/ActionFilters/AdminFilter.cs
index 5195a26..e5c56ec 100644
--- a/Portal.CMS.Web/Architecture/ActionFilters/AdminFilter.cs
+++ b/PortalCMS.Web/Architecture/ActionFilters/AdminFilter.cs
@@ -1,8 +1,8 @@
-using Portal.CMS.Web.Architecture.Helpers;
+using PortalCMS.Web.Architecture.Helpers;
 using System.Web.Mvc;
 using System.Web.Routing;
 
-namespace Portal.CMS.Web.Architecture.ActionFilters
+namespace PortalCMS.Web.Architecture.ActionFilters
 {
     public sealed class AdminFilter : ActionFilterAttribute
     {
diff --git a/Portal.CMS.Web/Architecture/ActionFilters/EditorFilter.cs b/PortalCMS.Web/Architecture/ActionFilters/EditorFilter.cs
similarity index 90%
rename from Portal.CMS.Web/Architecture/ActionFilters/EditorFilter.cs
rename to PortalCMS.Web/Architecture/ActionFilters/EditorFilter.cs
index 90d3857..a180e09 100644
--- a/Portal.CMS.Web/Architecture/ActionFilters/EditorFilter.cs
+++ b/PortalCMS.Web/Architecture/ActionFilters/EditorFilter.cs
@@ -1,8 +1,8 @@
-using Portal.CMS.Web.Architecture.Helpers;
+using PortalCMS.Web.Architecture.Helpers;
 using System.Web.Mvc;
 using System.Web.Routing;
 
-namespace Portal.CMS.Web.Architecture.ActionFilters
+namespace PortalCMS.Web.Architecture.ActionFilters
 {
     public sealed class EditorFilter : ActionFilterAttribute
     {
diff --git a/Portal.CMS.Web/Architecture/ActionFilters/LoggedInFilter.cs b/PortalCMS.Web/Architecture/ActionFilters/LoggedInFilter.cs
similarity index 82%
rename from Portal.CMS.Web/Architecture/ActionFilters/LoggedInFilter.cs
rename to PortalCMS.Web/Architecture/ActionFilters/LoggedInFilter.cs
index 26907c2..3afc32e 100644
--- a/Portal.CMS.Web/Architecture/ActionFilters/LoggedInFilter.cs
+++ b/PortalCMS.Web/Architecture/ActionFilters/LoggedInFilter.cs
@@ -1,8 +1,8 @@
-using Portal.CMS.Web.Architecture.Helpers;
+using PortalCMS.Web.Architecture.Helpers;
 using System.Web.Mvc;
 using System.Web.Routing;
 
-namespace Portal.CMS.Web.Architecture.ActionFilters
+namespace PortalCMS.Web.Architecture.ActionFilters
 {
     public sealed class LoggedInFilter : ActionFilterAttribute
     {
diff --git a/Portal.CMS.Web/Architecture/ActionFilters/ValidateJsonAntiForgeryTokenAttribute.cs b/PortalCMS.Web/Architecture/ActionFilters/ValidateJsonAntiForgeryTokenAttribute.cs
similarity index 93%
rename from Portal.CMS.Web/Architecture/ActionFilters/ValidateJsonAntiForgeryTokenAttribute.cs
rename to PortalCMS.Web/Architecture/ActionFilters/ValidateJsonAntiForgeryTokenAttribute.cs
index 04c60f3..dee09ac 100644
--- a/Portal.CMS.Web/Architecture/ActionFilters/ValidateJsonAntiForgeryTokenAttribute.cs
+++ b/PortalCMS.Web/Architecture/ActionFilters/ValidateJsonAntiForgeryTokenAttribute.cs
@@ -2,7 +2,7 @@
 using System.Web.Helpers;
 using System.Web.Mvc;
 
-namespace Portal.CMS.Web.Architecture.ActionFilters
+namespace PortalCMS.Web.Architecture.ActionFilters
 {
     [AttributeUsage(AttributeTargets.Method | AttributeTargets.Class, AllowMultiple = false, Inherited = true)]
     public class ValidateJsonAntiForgeryTokenAttribute : FilterAttribute, IAuthorizationFilter
diff --git a/Portal.CMS.Web/Architecture/DependencyResolution/ControllerConvention.cs b/PortalCMS.Web/Architecture/DependencyResolution/ControllerConvention.cs
similarity index 91%
rename from Portal.CMS.Web/Architecture/DependencyResolution/ControllerConvention.cs
rename to PortalCMS.Web/Architecture/DependencyResolution/ControllerConvention.cs
index 76ae30d..60a0e8e 100644
--- a/Portal.CMS.Web/Architecture/DependencyResolution/ControllerConvention.cs
+++ b/PortalCMS.Web/Architecture/DependencyResolution/ControllerConvention.cs
@@ -1,4 +1,4 @@
-namespace Portal.CMS.Web.DependencyResolution
+namespace PortalCMS.Web.DependencyResolution
 {
     using StructureMap.Configuration.DSL;
     using StructureMap.Graph;
diff --git a/Portal.CMS.Web/Architecture/DependencyResolution/DefaultRegistry.cs b/PortalCMS.Web/Architecture/DependencyResolution/DefaultRegistry.cs
similarity index 80%
rename from Portal.CMS.Web/Architecture/DependencyResolution/DefaultRegistry.cs
rename to PortalCMS.Web/Architecture/DependencyResolution/DefaultRegistry.cs
index 9a8bb08..fc19d99 100644
--- a/Portal.CMS.Web/Architecture/DependencyResolution/DefaultRegistry.cs
+++ b/PortalCMS.Web/Architecture/DependencyResolution/DefaultRegistry.cs
@@ -1,4 +1,4 @@
-namespace Portal.CMS.Web.DependencyResolution
+namespace PortalCMS.Web.DependencyResolution
 {
     using StructureMap.Configuration.DSL;
     using StructureMap.Graph;
@@ -13,7 +13,7 @@ public DefaultRegistry()
                     scan.TheCallingAssembly();
                     scan.WithDefaultConventions();
                     scan.With(new ControllerConvention());
-                    scan.Assembly("Portal.CMS.Services");
+                    scan.Assembly("PortalCMS.Services");
                 });
         }
     }
diff --git a/Portal.CMS.Web/Architecture/DependencyResolution/IoC.cs b/PortalCMS.Web/Architecture/DependencyResolution/IoC.cs
similarity index 71%
rename from Portal.CMS.Web/Architecture/DependencyResolution/IoC.cs
rename to PortalCMS.Web/Architecture/DependencyResolution/IoC.cs
index 4f743e1..3ab1646 100644
--- a/Portal.CMS.Web/Architecture/DependencyResolution/IoC.cs
+++ b/PortalCMS.Web/Architecture/DependencyResolution/IoC.cs
@@ -1,4 +1,4 @@
-namespace Portal.CMS.Web.DependencyResolution
+namespace PortalCMS.Web.DependencyResolution
 {
     using Areas.Admin.Controllers;
     using Entities;
@@ -13,7 +13,7 @@ public static IContainer Initialize()
                 {
                     c.AddRegistry<DefaultRegistry>();
                     c.For<AnalyticManagerController>().AlwaysUnique();
-                    c.For<PortalEntityModel>().Use<PortalEntityModel>().SelectConstructor(() => new PortalEntityModel());
+                    c.For<PortalDbContext>().Use<PortalDbContext>().SelectConstructor(() => new PortalDbContext());
                 }
             );
         }
diff --git a/Portal.CMS.Web/Architecture/DependencyResolution/StructureMapDependencyResolver.cs b/PortalCMS.Web/Architecture/DependencyResolution/StructureMapDependencyResolver.cs
similarity index 96%
rename from Portal.CMS.Web/Architecture/DependencyResolution/StructureMapDependencyResolver.cs
rename to PortalCMS.Web/Architecture/DependencyResolution/StructureMapDependencyResolver.cs
index 193d1f2..cd05a1a 100644
--- a/Portal.CMS.Web/Architecture/DependencyResolution/StructureMapDependencyResolver.cs
+++ b/PortalCMS.Web/Architecture/DependencyResolution/StructureMapDependencyResolver.cs
@@ -1,4 +1,4 @@
-namespace Portal.CMS.Web.DependencyResolution
+namespace PortalCMS.Web.DependencyResolution
 {
     using StructureMap;
     using System.Web.Http.Dependencies;
diff --git a/Portal.CMS.Web/Architecture/DependencyResolution/StructureMapDependencyScope.cs b/PortalCMS.Web/Architecture/DependencyResolution/StructureMapDependencyScope.cs
similarity index 98%
rename from Portal.CMS.Web/Architecture/DependencyResolution/StructureMapDependencyScope.cs
rename to PortalCMS.Web/Architecture/DependencyResolution/StructureMapDependencyScope.cs
index 67d4c1c..ba9349b 100644
--- a/Portal.CMS.Web/Architecture/DependencyResolution/StructureMapDependencyScope.cs
+++ b/PortalCMS.Web/Architecture/DependencyResolution/StructureMapDependencyScope.cs
@@ -1,4 +1,4 @@
-namespace Portal.CMS.Web.DependencyResolution
+namespace PortalCMS.Web.DependencyResolution
 {
     using Microsoft.Practices.ServiceLocation;
     using StructureMap;
diff --git a/Portal.CMS.Web/Architecture/DependencyResolution/StructureMapScopeModule.cs b/PortalCMS.Web/Architecture/DependencyResolution/StructureMapScopeModule.cs
similarity index 89%
rename from Portal.CMS.Web/Architecture/DependencyResolution/StructureMapScopeModule.cs
rename to PortalCMS.Web/Architecture/DependencyResolution/StructureMapScopeModule.cs
index 237b06a..8b2be07 100644
--- a/Portal.CMS.Web/Architecture/DependencyResolution/StructureMapScopeModule.cs
+++ b/PortalCMS.Web/Architecture/DependencyResolution/StructureMapScopeModule.cs
@@ -1,6 +1,6 @@
-namespace Portal.CMS.Web.DependencyResolution
+namespace PortalCMS.Web.DependencyResolution
 {
-    using Portal.CMS.Web.App_Start;
+    using PortalCMS.Web.App_Start;
     using StructureMap.Web.Pipeline;
     using System.Web;
 
diff --git a/Portal.CMS.Web/Architecture/DependencyResolution/StructureMapWebApiDependencyResolver.cs b/PortalCMS.Web/Architecture/DependencyResolution/StructureMapWebApiDependencyResolver.cs
similarity index 96%
rename from Portal.CMS.Web/Architecture/DependencyResolution/StructureMapWebApiDependencyResolver.cs
rename to PortalCMS.Web/Architecture/DependencyResolution/StructureMapWebApiDependencyResolver.cs
index a4ac572..e0670b2 100644
--- a/Portal.CMS.Web/Architecture/DependencyResolution/StructureMapWebApiDependencyResolver.cs
+++ b/PortalCMS.Web/Architecture/DependencyResolution/StructureMapWebApiDependencyResolver.cs
@@ -1,7 +1,7 @@
 using StructureMap;
 using System.Web.Http.Dependencies;
 
-namespace Portal.CMS.Web.DependencyResolution
+namespace PortalCMS.Web.DependencyResolution
 {
     /// <summary>
     /// The structure map dependency resolver.
diff --git a/Portal.CMS.Web/Architecture/DependencyResolution/StructureMapWebApiDependencyScope.cs b/PortalCMS.Web/Architecture/DependencyResolution/StructureMapWebApiDependencyScope.cs
similarity index 89%
rename from Portal.CMS.Web/Architecture/DependencyResolution/StructureMapWebApiDependencyScope.cs
rename to PortalCMS.Web/Architecture/DependencyResolution/StructureMapWebApiDependencyScope.cs
index a520ceb..b9e5d76 100644
--- a/Portal.CMS.Web/Architecture/DependencyResolution/StructureMapWebApiDependencyScope.cs
+++ b/PortalCMS.Web/Architecture/DependencyResolution/StructureMapWebApiDependencyScope.cs
@@ -1,7 +1,7 @@
 using StructureMap;
 using System.Web.Http.Dependencies;
 
-namespace Portal.CMS.Web.DependencyResolution
+namespace PortalCMS.Web.DependencyResolution
 {
     /// <summary>
     /// The structure map web api dependency scope.
diff --git a/Portal.CMS.Web/Architecture/Extensions/FontExtensions.cs b/PortalCMS.Web/Architecture/Extensions/FontExtensions.cs
similarity index 73%
rename from Portal.CMS.Web/Architecture/Extensions/FontExtensions.cs
rename to PortalCMS.Web/Architecture/Extensions/FontExtensions.cs
index 5b41324..71e2faa 100644
--- a/Portal.CMS.Web/Architecture/Extensions/FontExtensions.cs
+++ b/PortalCMS.Web/Architecture/Extensions/FontExtensions.cs
@@ -1,7 +1,7 @@
-using Portal.CMS.Entities.Entities;
-using Portal.CMS.Web.Architecture.Helpers;
+using PortalCMS.Entities.Entities;
+using PortalCMS.Web.Architecture.Helpers;
 
-namespace Portal.CMS.Web.Architecture.Extensions
+namespace PortalCMS.Web.Architecture.Extensions
 {
     public static class FontExtensions
     {
diff --git a/Portal.CMS.Web/Architecture/Extensions/ImageExtensions.cs b/PortalCMS.Web/Architecture/Extensions/ImageExtensions.cs
similarity index 74%
rename from Portal.CMS.Web/Architecture/Extensions/ImageExtensions.cs
rename to PortalCMS.Web/Architecture/Extensions/ImageExtensions.cs
index 1a423ef..ca6e29f 100644
--- a/Portal.CMS.Web/Architecture/Extensions/ImageExtensions.cs
+++ b/PortalCMS.Web/Architecture/Extensions/ImageExtensions.cs
@@ -1,7 +1,7 @@
-using Portal.CMS.Entities.Entities;
-using Portal.CMS.Web.Architecture.Helpers;
+using PortalCMS.Entities.Entities;
+using PortalCMS.Web.Architecture.Helpers;
 
-namespace Portal.CMS.Web.Architecture.Extensions
+namespace PortalCMS.Web.Architecture.Extensions
 {
     public static class ImageExtensions
     {
diff --git a/Portal.CMS.Web/Architecture/Extensions/PostExtensions.cs b/PortalCMS.Web/Architecture/Extensions/PostExtensions.cs
similarity index 82%
rename from Portal.CMS.Web/Architecture/Extensions/PostExtensions.cs
rename to PortalCMS.Web/Architecture/Extensions/PostExtensions.cs
index bcd870a..050415f 100644
--- a/Portal.CMS.Web/Architecture/Extensions/PostExtensions.cs
+++ b/PortalCMS.Web/Architecture/Extensions/PostExtensions.cs
@@ -1,9 +1,9 @@
-using Portal.CMS.Entities.Entities;
-using Portal.CMS.Entities.Enumerators;
-using Portal.CMS.Web.Architecture.Helpers;
+using PortalCMS.Entities.Entities;
+using PortalCMS.Entities.Enumerators;
+using PortalCMS.Web.Architecture.Helpers;
 using System.Linq;
 
-namespace Portal.CMS.Web.Architecture.Extensions
+namespace PortalCMS.Web.Architecture.Extensions
 {
     public static class PostExtensions
     {
diff --git a/Portal.CMS.Web/Architecture/Helpers/AsyncHelpers.cs b/PortalCMS.Web/Architecture/Helpers/AsyncHelpers.cs
similarity index 98%
rename from Portal.CMS.Web/Architecture/Helpers/AsyncHelpers.cs
rename to PortalCMS.Web/Architecture/Helpers/AsyncHelpers.cs
index a7c03b6..265efd2 100644
--- a/Portal.CMS.Web/Architecture/Helpers/AsyncHelpers.cs
+++ b/PortalCMS.Web/Architecture/Helpers/AsyncHelpers.cs
@@ -3,7 +3,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace Portal.CMS.Web.Architecture.Helpers
+namespace PortalCMS.Web.Architecture.Helpers
 {
     public static class AsyncHelpers
     {
diff --git a/PortalCMS.Web/Architecture/Helpers/EmailHelper.cs b/PortalCMS.Web/Architecture/Helpers/EmailHelper.cs
new file mode 100644
index 0000000..e5ac3ba
--- /dev/null
+++ b/PortalCMS.Web/Architecture/Helpers/EmailHelper.cs
@@ -0,0 +1,130 @@
+using Microsoft.AspNet.Identity.Owin;
+using PortalCMS.Entities.Entities.Models;
+using PortalCMS.Library.ExtensionMethods;
+using SendGrid;
+using SendGrid.Helpers.Mail;
+using System;
+using System.IO;
+using System.Threading.Tasks;
+using System.Web;
+using System.Web.Mvc;
+
+namespace PortalCMS.Web.Architecture.Helpers
+{
+	public class EmailHelper
+	{
+		private const string LOGO_IMAGE_URL = "/images/logo.png";
+		private const string EMAIL_TEMPLATE_DIRECTORY = "/Content/EmailTemplates";
+
+		const string WEBSITE_NAME = "Website Name";
+		const string EMAIL_FROM_ADDRESS = "Email From Address";
+		const string SENDGRID_API_KEY = "SendGrid ApiKey";
+
+		public static bool IsEmailEnabled
+		{
+			get
+			{
+				return SettingHelper.Get(SENDGRID_API_KEY).HasValue();
+			}
+		}
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="user"></param>
+		/// <param name="code"></param>
+		/// <returns></returns>
+		public static async Task SendAccountActivationLinkAsync(ApplicationUser user, string code, string callbackUrl)
+		{
+			// Send an email with this link
+			var messageBody = LoadTemplate("AccountActivationLink", "Account Activation");
+			messageBody = messageBody.Replace("@Model.ActionLink", callbackUrl);
+			messageBody = messageBody.Replace("@Model.Name", user.FullName);
+
+			await SendEmailAsync(user.Email, "Account activation link enclosed", messageBody);
+		}
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="email"></param>
+		/// <param name="token"></param>
+		/// <returns></returns>
+		public static async Task SendPasswordResetLinkAsync(ApplicationUser user, string token, string callbackUrl)
+		{
+			// Send an email with this link
+			var messageBody = LoadTemplate("PasswordResetLink", "Password Reset");
+			messageBody = messageBody.Replace("@Model.ActionLink", callbackUrl);
+			messageBody = messageBody.Replace("@Model.Name", user.FullName);
+
+			await SendEmailAsync(user.Email, "Password reset link enclosed", messageBody);
+		}
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="email"></param>
+		/// <returns></returns>
+		public static async Task SendPasswordChangedAsync(string email, string fullName)
+		{
+			// Send an email
+			var messageBody = LoadTemplate("PasswordChanged", "Account Notification");
+			messageBody = messageBody.Replace("@Model.FullName", string.Format("{0:dd-MMM-yyyy}", DateTime.Now));
+			messageBody = messageBody.Replace("@Model.ChangeDate", string.Format("{0:dd-MMM-yyyy}", DateTime.Now));
+
+			await SendEmailAsync(email, "Password reset link enclosed", messageBody);
+		}
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="email"></param>
+		/// <param name="token"></param>
+		/// <returns></returns>
+		public static async Task SendContactUsMessageAsync(string toEmail, string fromEmail, string name, string subject, string message)
+		{
+			// Send an email
+			var messageBody = LoadTemplate("ContactUsMessage", "Contact-Us Message Received");
+			messageBody = messageBody.Replace("@Model.FromEmailAddress", fromEmail);
+			messageBody = messageBody.Replace("@Model.Name", name);
+			messageBody = messageBody.Replace("@Model.Subject", subject);
+			messageBody = messageBody.Replace("@Model.Message", message);
+			await SendEmailAsync(toEmail, "Password reset link enclosed", messageBody);
+		}
+
+		#region private methods
+
+		private static async Task SendEmailAsync(string recipientEmailAddress, string subject, string messageBody)
+		{
+			var apiKey = SettingHelper.Get(SENDGRID_API_KEY);
+			var client = new SendGridClient(apiKey);
+			var from = new EmailAddress(SettingHelper.Get(EMAIL_FROM_ADDRESS), SettingHelper.Get(WEBSITE_NAME));
+			var to = new EmailAddress(recipientEmailAddress);
+			var plainTextContent = messageBody;
+			var htmlContent = messageBody;
+			var msg = MailHelper.CreateSingleEmail(from, to, subject, plainTextContent, htmlContent);
+
+			await client.SendEmailAsync(msg);
+		}
+
+		private static string LoadTemplate(string templateName, string templateTitle)
+		{
+			string emailTemplateBasePage = string.Format("{0}/Base/Base.html", EMAIL_TEMPLATE_DIRECTORY);
+			string baseTemplate = File.OpenText(HttpContext.Current.Server.MapPath(string.Format("~/{0}", emailTemplateBasePage))).ReadToEnd();
+			string body = File.OpenText(HttpContext.Current.Server.MapPath(string.Format("~/{0}/{1}.html", EMAIL_TEMPLATE_DIRECTORY, templateName))).ReadToEnd();
+			string logoUrl = HttpContext.Current.Server.MapPath("/images/logo.png");
+			string portalName = SettingHelper.Get(WEBSITE_NAME);
+			string portalAddress = string.Empty;
+
+			baseTemplate = baseTemplate.Replace("@Model.TemplateBody", body);
+			baseTemplate = baseTemplate.Replace("@Model.Title", templateTitle);
+			baseTemplate = baseTemplate.Replace("@Model.Logo", logoUrl);
+			baseTemplate = baseTemplate.Replace("@Model.PortalName", portalName);
+			baseTemplate = baseTemplate.Replace("@Model.PortalAddress", portalAddress);
+
+			return baseTemplate;
+		}
+
+		#endregion
+	}
+}
diff --git a/PortalCMS.Web/Architecture/Helpers/MenuHelper.cs b/PortalCMS.Web/Architecture/Helpers/MenuHelper.cs
new file mode 100644
index 0000000..c2b1c30
--- /dev/null
+++ b/PortalCMS.Web/Architecture/Helpers/MenuHelper.cs
@@ -0,0 +1,42 @@
+using PortalCMS.Entities.Entities;
+using PortalCMS.Services.Menu;
+using PortalCMS.Web.DependencyResolution;
+using System.Collections.Generic;
+
+namespace PortalCMS.Web.Architecture.Helpers
+{
+	public static class MenuHelper
+	{
+		public static List<MenuItem> Get(string menuName)
+		{
+			var validSession = System.Web.HttpContext.Current.Session != null;
+
+			object sessionMenu = null;
+
+			if (validSession)
+			{
+				sessionMenu = System.Web.HttpContext.Current.Session[$"Menu-{menuName}"];
+			}
+
+			if (sessionMenu != null)
+			{
+				return (List<MenuItem>)sessionMenu;
+			}
+			else
+			{
+				var container = IoC.Initialize();
+
+				IMenuService menuService = container.GetInstance<MenuService>();
+
+				var menuItems = AsyncHelpers.RunSync(() => menuService.ViewAsync(UserHelper.Id, menuName));
+
+				if (validSession)
+				{
+					System.Web.HttpContext.Current.Session.Add($"Menu-{menuName}", menuItems);
+				}
+
+				return menuItems;
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/PortalCMS.Web/Architecture/Helpers/SettingHelper.cs b/PortalCMS.Web/Architecture/Helpers/SettingHelper.cs
new file mode 100644
index 0000000..cde0bdb
--- /dev/null
+++ b/PortalCMS.Web/Architecture/Helpers/SettingHelper.cs
@@ -0,0 +1,78 @@
+using PortalCMS.Services.Settings;
+using PortalCMS.Web.DependencyResolution;
+using System;
+using System.IO;
+using System.Web;
+
+namespace PortalCMS.Web.Architecture.Helpers
+{
+	public static class SettingHelper
+	{
+		private const string IMAGE_DIRECTORY = "~/Areas/Admin/Content/Media/";
+
+		public static string Get(string settingName)
+		{
+			var validSession = System.Web.HttpContext.Current.Session != null;
+
+			object sessionSetting = null;
+
+			if (validSession)
+			{
+				sessionSetting = System.Web.HttpContext.Current.Session[$"Setting-{settingName}"];
+			}
+
+			if (sessionSetting != null)
+			{
+				return sessionSetting.ToString();
+			}
+			else
+			{
+				var container = IoC.Initialize();
+
+				var settingService = container.GetInstance<SettingService>();
+
+				var setting = AsyncHelpers.RunSync(() => settingService.GetAsync(settingName));
+
+				if (setting == null)
+					return string.Empty;
+
+				if (validSession)
+				{
+					System.Web.HttpContext.Current.Session.Add($"Setting-{settingName}", setting.SettingValue);
+				}
+
+				return setting.SettingValue;
+			}
+		}
+
+		public static byte[] GetImage(string settingName)
+		{
+			if (string.IsNullOrEmpty(settingName))
+			{
+				return null;
+			}
+
+			var imagePath = Get(settingName);
+			var filePath = HttpContext.Current.Server.MapPath(Path.Combine(IMAGE_DIRECTORY, imagePath));
+			if (!File.Exists(filePath)) { return null; }
+
+			FileStream fs = null;
+
+			try
+			{
+				fs = File.OpenRead(filePath);
+				var bytes = new byte[fs.Length];
+				fs.Read(bytes, 0, Convert.ToInt32(fs.Length));
+				return bytes;
+			}
+			finally
+			{
+				if (fs != null)
+				{
+					fs.Close();
+					fs.Dispose();
+				}
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/Portal.CMS.Web/Architecture/Helpers/ThemeHelper.cs b/PortalCMS.Web/Architecture/Helpers/ThemeHelper.cs
similarity index 90%
rename from Portal.CMS.Web/Architecture/Helpers/ThemeHelper.cs
rename to PortalCMS.Web/Architecture/Helpers/ThemeHelper.cs
index 1cf99c7..00c21dc 100644
--- a/Portal.CMS.Web/Architecture/Helpers/ThemeHelper.cs
+++ b/PortalCMS.Web/Architecture/Helpers/ThemeHelper.cs
@@ -1,7 +1,7 @@
-using Portal.CMS.Services.Themes;
-using Portal.CMS.Web.DependencyResolution;
+using PortalCMS.Services.Themes;
+using PortalCMS.Web.DependencyResolution;
 
-namespace Portal.CMS.Web.Architecture.Helpers
+namespace PortalCMS.Web.Architecture.Helpers
 {
     public static class ThemeHelper
     {
diff --git a/PortalCMS.Web/Architecture/Helpers/UserHelper.cs b/PortalCMS.Web/Architecture/Helpers/UserHelper.cs
new file mode 100644
index 0000000..9b498be
--- /dev/null
+++ b/PortalCMS.Web/Architecture/Helpers/UserHelper.cs
@@ -0,0 +1,153 @@
+using PortalCMS.Entities.Entities;
+using PortalCMS.Entities.Entities.Models;
+using System.Collections.Generic;
+using Microsoft.AspNet.Identity;
+using System.Linq;
+using System.Web;
+using PortalCMS.Entities;
+using Microsoft.AspNet.Identity.EntityFramework;
+
+namespace PortalCMS.Web.Architecture.Helpers
+{
+	public class UserHelper
+	{
+		const string ADMIN_ROLE = "Admin";
+		const string EDITOR_ROLE = "Editor";
+	
+		private static ApplicationUser CurrentUser
+		{
+			get
+			{
+				var store = new UserStore<ApplicationUser>(new PortalDbContext());
+				var userManager = new UserManager<ApplicationUser>(store);
+				var userId = HttpContext.Current.User.Identity.GetUserId();
+				return userManager.FindById(userId);
+			}
+		}
+
+		public static bool IsLoggedIn
+		{
+			get
+			{
+				return HttpContext.Current.User.Identity.IsAuthenticated;
+			}
+		}
+
+		public static bool IsAdmin
+		{
+			get
+			{
+				if (HttpContext.Current.User.Identity.IsAuthenticated)
+				{
+					return HttpContext.Current.User.IsInRole(ADMIN_ROLE);
+				}
+
+				return false;
+			}
+		}
+
+		public static bool IsEditor
+		{
+			get
+			{
+				if (HttpContext.Current.User.Identity.IsAuthenticated)
+				{
+					return HttpContext.Current.User.IsInRole(ADMIN_ROLE) || HttpContext.Current.User.IsInRole(EDITOR_ROLE);
+				}
+
+				return false;
+			}
+		}
+
+		public static string Id
+		{
+			get
+			{
+				if (HttpContext.Current.User.Identity.IsAuthenticated)
+				{
+					return CurrentUser.Id;
+				}
+
+				return string.Empty;
+			}
+		}
+
+		public static byte[] AvatarImage
+		{
+			get
+			{
+				if (HttpContext.Current.User.Identity.IsAuthenticated)
+				{ 
+					return CurrentUser.AvatarImage.FileContent;
+				}
+
+				return null;
+			}
+		}
+
+		public static string FullName
+		{
+			get
+			{
+				if (HttpContext.Current.User.Identity.IsAuthenticated)
+				{
+					return CurrentUser.FullName;
+				}
+
+				return string.Empty;
+			}
+		}
+
+		public static string GivenName
+		{
+			get
+			{
+				if (HttpContext.Current.User.Identity.IsAuthenticated)
+				{
+					return CurrentUser.GivenName;
+				}
+
+				return string.Empty;
+			}
+		}
+
+		public static string FamilyName
+		{
+			get
+			{
+				if (HttpContext.Current.User.Identity.IsAuthenticated)
+				{
+					return CurrentUser.FamilyName;
+				}
+
+				return string.Empty;
+			}
+		}
+
+		public static string Email
+		{
+			get
+			{
+				if (HttpContext.Current.User.Identity.IsAuthenticated)
+				{
+					return CurrentUser.Email;
+				}
+
+				return string.Empty;
+			}
+		}
+
+		public static string Bio
+		{
+			get
+			{
+				if (HttpContext.Current.User.Identity.IsAuthenticated)
+				{
+					return CurrentUser.Bio;
+				}
+
+				return "You haven't written a Bio yet...";
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/Portal.CMS.Web/Architecture/Modules/RemoveResponseHeadersModule.cs b/PortalCMS.Web/Architecture/Modules/RemoveResponseHeadersModule.cs
similarity index 88%
rename from Portal.CMS.Web/Architecture/Modules/RemoveResponseHeadersModule.cs
rename to PortalCMS.Web/Architecture/Modules/RemoveResponseHeadersModule.cs
index ddfd7ab..7ded04f 100644
--- a/Portal.CMS.Web/Architecture/Modules/RemoveResponseHeadersModule.cs
+++ b/PortalCMS.Web/Architecture/Modules/RemoveResponseHeadersModule.cs
@@ -1,6 +1,6 @@
 using System.Web;
 
-namespace Portal.CMS.Web.Architecture.Modules
+namespace PortalCMS.Web.Architecture.Modules
 {
     public class RemoveResponseHeadersModule : IHttpModule
     {
diff --git a/Portal.CMS.Web/Architecture/ViewEngines/CSSViewEngine.cs b/PortalCMS.Web/Architecture/ViewEngines/CSSViewEngine.cs
similarity index 93%
rename from Portal.CMS.Web/Architecture/ViewEngines/CSSViewEngine.cs
rename to PortalCMS.Web/Architecture/ViewEngines/CSSViewEngine.cs
index e3cb416..eac6f26 100644
--- a/Portal.CMS.Web/Architecture/ViewEngines/CSSViewEngine.cs
+++ b/PortalCMS.Web/Architecture/ViewEngines/CSSViewEngine.cs
@@ -1,6 +1,6 @@
 using System.Web.Mvc;
 
-namespace Portal.CMS.Web.Architecture.ViewEngines
+namespace PortalCMS.Web.Architecture.ViewEngines
 {
     public class CSSViewEngine : RazorViewEngine
     {
diff --git a/Portal.CMS.Web/Areas/Admin/AdminAreaRegistration.cs b/PortalCMS.Web/Areas/Admin/AdminAreaRegistration.cs
similarity index 93%
rename from Portal.CMS.Web/Areas/Admin/AdminAreaRegistration.cs
rename to PortalCMS.Web/Areas/Admin/AdminAreaRegistration.cs
index 334563c..c10367b 100644
--- a/Portal.CMS.Web/Areas/Admin/AdminAreaRegistration.cs
+++ b/PortalCMS.Web/Areas/Admin/AdminAreaRegistration.cs
@@ -1,6 +1,6 @@
 using System.Web.Mvc;
 
-namespace Portal.CMS.Web.Areas.Admin
+namespace PortalCMS.Web.Areas.Admin
 {
     public class AdminAreaRegistration : AreaRegistration
     {
diff --git a/PortalCMS.Web/Areas/Admin/Content/Images/Noimage.png b/PortalCMS.Web/Areas/Admin/Content/Images/Noimage.png
new file mode 100644
index 0000000..a4cb574
Binary files /dev/null and b/PortalCMS.Web/Areas/Admin/Content/Images/Noimage.png differ
diff --git a/Portal.CMS.Web/Areas/Admin/Content/Images/block_black_dark.png b/PortalCMS.Web/Areas/Admin/Content/Images/block_black_dark.png
similarity index 100%
rename from Portal.CMS.Web/Areas/Admin/Content/Images/block_black_dark.png
rename to PortalCMS.Web/Areas/Admin/Content/Images/block_black_dark.png
diff --git a/Portal.CMS.Web/Areas/Admin/Content/Images/block_black_light.png b/PortalCMS.Web/Areas/Admin/Content/Images/block_black_light.png
similarity index 100%
rename from Portal.CMS.Web/Areas/Admin/Content/Images/block_black_light.png
rename to PortalCMS.Web/Areas/Admin/Content/Images/block_black_light.png
diff --git a/Portal.CMS.Web/Areas/Admin/Content/Images/block_black_medium.png b/PortalCMS.Web/Areas/Admin/Content/Images/block_black_medium.png
similarity index 100%
rename from Portal.CMS.Web/Areas/Admin/Content/Images/block_black_medium.png
rename to PortalCMS.Web/Areas/Admin/Content/Images/block_black_medium.png
diff --git a/Portal.CMS.Web/Areas/Admin/Content/Images/icon-articles.png b/PortalCMS.Web/Areas/Admin/Content/Images/icon-articles.png
similarity index 100%
rename from Portal.CMS.Web/Areas/Admin/Content/Images/icon-articles.png
rename to PortalCMS.Web/Areas/Admin/Content/Images/icon-articles.png
diff --git a/Portal.CMS.Web/Areas/Admin/Content/Images/icon-copy.png b/PortalCMS.Web/Areas/Admin/Content/Images/icon-copy.png
similarity index 100%
rename from Portal.CMS.Web/Areas/Admin/Content/Images/icon-copy.png
rename to PortalCMS.Web/Areas/Admin/Content/Images/icon-copy.png
diff --git a/Portal.CMS.Web/Areas/Admin/Content/Images/icon-dashboard.png b/PortalCMS.Web/Areas/Admin/Content/Images/icon-dashboard.png
similarity index 100%
rename from Portal.CMS.Web/Areas/Admin/Content/Images/icon-dashboard.png
rename to PortalCMS.Web/Areas/Admin/Content/Images/icon-dashboard.png
diff --git a/Portal.CMS.Web/Areas/Admin/Content/Images/icon-media.png b/PortalCMS.Web/Areas/Admin/Content/Images/icon-media.png
similarity index 100%
rename from Portal.CMS.Web/Areas/Admin/Content/Images/icon-media.png
rename to PortalCMS.Web/Areas/Admin/Content/Images/icon-media.png
diff --git a/Portal.CMS.Web/Areas/Admin/Content/Images/icon-pages.png b/PortalCMS.Web/Areas/Admin/Content/Images/icon-pages.png
similarity index 100%
rename from Portal.CMS.Web/Areas/Admin/Content/Images/icon-pages.png
rename to PortalCMS.Web/Areas/Admin/Content/Images/icon-pages.png
diff --git a/Portal.CMS.Web/Areas/Admin/Content/Images/icon-reports.png b/PortalCMS.Web/Areas/Admin/Content/Images/icon-reports.png
similarity index 100%
rename from Portal.CMS.Web/Areas/Admin/Content/Images/icon-reports.png
rename to PortalCMS.Web/Areas/Admin/Content/Images/icon-reports.png
diff --git a/Portal.CMS.Web/Areas/Admin/Content/Images/icon-settings.png b/PortalCMS.Web/Areas/Admin/Content/Images/icon-settings.png
similarity index 100%
rename from Portal.CMS.Web/Areas/Admin/Content/Images/icon-settings.png
rename to PortalCMS.Web/Areas/Admin/Content/Images/icon-settings.png
diff --git a/Portal.CMS.Web/Areas/Admin/Content/Images/icon-thememanager.png b/PortalCMS.Web/Areas/Admin/Content/Images/icon-thememanager.png
similarity index 100%
rename from Portal.CMS.Web/Areas/Admin/Content/Images/icon-thememanager.png
rename to PortalCMS.Web/Areas/Admin/Content/Images/icon-thememanager.png
diff --git a/Portal.CMS.Web/Areas/Admin/Content/Images/icon-users.png b/PortalCMS.Web/Areas/Admin/Content/Images/icon-users.png
similarity index 100%
rename from Portal.CMS.Web/Areas/Admin/Content/Images/icon-users.png
rename to PortalCMS.Web/Areas/Admin/Content/Images/icon-users.png
diff --git a/Portal.CMS.Web/Areas/Admin/Content/Images/profile-image-male.png b/PortalCMS.Web/Areas/Admin/Content/Images/profile-image-male.png
similarity index 100%
rename from Portal.CMS.Web/Areas/Admin/Content/Images/profile-image-male.png
rename to PortalCMS.Web/Areas/Admin/Content/Images/profile-image-male.png
diff --git a/PortalCMS.Web/Areas/Admin/Content/Images/recaptcha.png b/PortalCMS.Web/Areas/Admin/Content/Images/recaptcha.png
new file mode 100644
index 0000000..54a89e8
Binary files /dev/null and b/PortalCMS.Web/Areas/Admin/Content/Images/recaptcha.png differ
diff --git a/Portal.CMS.Web/Areas/Admin/Content/Images/texture.png b/PortalCMS.Web/Areas/Admin/Content/Images/texture.png
similarity index 100%
rename from Portal.CMS.Web/Areas/Admin/Content/Images/texture.png
rename to PortalCMS.Web/Areas/Admin/Content/Images/texture.png
diff --git a/Portal.CMS.Web/Areas/Admin/Controllers/AnalyticManagerController.cs b/PortalCMS.Web/Areas/Admin/Controllers/AnalyticManagerController.cs
similarity index 97%
rename from Portal.CMS.Web/Areas/Admin/Controllers/AnalyticManagerController.cs
rename to PortalCMS.Web/Areas/Admin/Controllers/AnalyticManagerController.cs
index 1479a9c..0341219 100644
--- a/Portal.CMS.Web/Areas/Admin/Controllers/AnalyticManagerController.cs
+++ b/PortalCMS.Web/Areas/Admin/Controllers/AnalyticManagerController.cs
@@ -1,15 +1,15 @@
 using LogBook.Services;
-using Portal.CMS.Entities.Enumerators;
-using Portal.CMS.Services.Analytics;
-using Portal.CMS.Web.Architecture.ActionFilters;
-using Portal.CMS.Web.Areas.Admin.ViewModels.AnalyticManager;
+using PortalCMS.Entities.Enumerators;
+using PortalCMS.Services.Analytics;
+using PortalCMS.Web.Architecture.ActionFilters;
+using PortalCMS.Web.Areas.Admin.ViewModels.AnalyticManager;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using System.Web.Mvc;
 
-namespace Portal.CMS.Web.Areas.Admin.Controllers
+namespace PortalCMS.Web.Areas.Admin.Controllers
 {
     [AdminFilter(ActionFilterResponseType.Page)]
     public class AnalyticManagerController : Controller
diff --git a/Portal.CMS.Web/Areas/Admin/Controllers/BlogManagerController.cs b/PortalCMS.Web/Areas/Admin/Controllers/BlogManagerController.cs
similarity index 92%
rename from Portal.CMS.Web/Areas/Admin/Controllers/BlogManagerController.cs
rename to PortalCMS.Web/Areas/Admin/Controllers/BlogManagerController.cs
index 4dd0f49..8cd2c50 100644
--- a/Portal.CMS.Web/Areas/Admin/Controllers/BlogManagerController.cs
+++ b/PortalCMS.Web/Areas/Admin/Controllers/BlogManagerController.cs
@@ -1,18 +1,18 @@
-using Portal.CMS.Entities.Enumerators;
-using Portal.CMS.Services.Authentication;
-using Portal.CMS.Services.Generic;
-using Portal.CMS.Services.Posts;
-using Portal.CMS.Web.Architecture.ActionFilters;
-using Portal.CMS.Web.Architecture.Helpers;
-using Portal.CMS.Web.Areas.Admin.ViewModels.BlogManager;
-using Portal.CMS.Web.ViewModels.Shared;
+using PortalCMS.Entities.Enumerators;
+using PortalCMS.Services.Authentication;
+using PortalCMS.Services.Generic;
+using PortalCMS.Services.Posts;
+using PortalCMS.Web.Architecture.ActionFilters;
+using PortalCMS.Web.Architecture.Helpers;
+using PortalCMS.Web.Areas.Admin.ViewModels.BlogManager;
+using PortalCMS.Web.ViewModels.Shared;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using System.Web.Mvc;
 
-namespace Portal.CMS.Web.Areas.Admin.Controllers
+namespace PortalCMS.Web.Areas.Admin.Controllers
 {
     public class BlogManagerController : Controller
     {
@@ -68,9 +68,9 @@ public async Task<ActionResult> Create()
             var model = new CreatePostViewModel
             {
                 PostCategoryId = postCategories.First().PostCategoryId,
-                PostAuthorUserId = UserHelper.UserId.Value,
+                PostAuthorUserId = UserHelper.Id,
                 PostCategoryList = postCategories,
-                UserList = await _userService.GetAsync(new List<string> { nameof(Admin), "Editor" }),
+                UserList = await _userService.GetByRoleAsync(new List<string> { nameof(Admin), "Editor" }),
                 PublicationState = PublicationState.Published,
                 BannerImages = new PaginationViewModel
                 {
@@ -112,7 +112,7 @@ public async Task<ActionResult> Create(CreatePostViewModel model)
                     PaginationType = GALLERY
                 };
                 model.PostCategoryList = await _postCategoryService.GetAsync();
-                model.UserList = await _userService.GetAsync(new List<string> { nameof(Admin), "Editor" });
+                model.UserList = await _userService.GetByRoleAsync(new List<string> { nameof(Admin), "Editor" });
                 model.RoleList = await _roleService.GetAsync();
 
                 return View("_Create", model);
@@ -148,7 +148,7 @@ public async Task<ActionResult> Edit(int postId)
                 PostAuthorUserId = post.PostAuthorUserId,
                 ExistingGalleryImageList = post.PostImages.Where(x => x.PostImageType == PostImageType.Gallery).Select(x => x.ImageId).ToList(),
                 PostCategoryList = await _postCategoryService.GetAsync(),
-                UserList = await _userService.GetAsync(new List<string> { nameof(Admin), "Editor" }),
+                UserList = await _userService.GetByRoleAsync(new List<string> { nameof(Admin), "Editor" }),
                 BannerImages = new PaginationViewModel
                 {
                     ImageList = imageList.Where(x => x.ImageCategory == ImageCategory.General || x.ImageCategory == ImageCategory.Screenshot || x.ImageCategory == ImageCategory.Texture),
@@ -162,7 +162,7 @@ public async Task<ActionResult> Edit(int postId)
                     PaginationType = GALLERY
                 },
                 RoleList = await _roleService.GetAsync(),
-                SelectedRoleList = post.PostRoles.Select(x => x.Role.RoleName).ToList()
+                SelectedRoleList = post.PostRoles.Select(x => x.Role.Name).ToList()
             };
 
             if (post.IsPublished)
@@ -196,7 +196,7 @@ public async Task<ActionResult> Edit(EditPostviewModel model)
                     PaginationType = GALLERY
                 };
                 model.PostCategoryList = await _postCategoryService.GetAsync();
-                model.UserList = await _userService.GetAsync(new List<string> { nameof(Admin), "Editor" });
+                model.UserList = await _userService.GetByRoleAsync(new List<string> { nameof(Admin), "Editor" });
                 model.RoleList = await _roleService.GetAsync();
 
                 return View("_Edit", model);
@@ -271,7 +271,7 @@ public async Task<ActionResult> Headline(int postId, string markup)
         [HttpGet, EditorFilter(ActionFilterResponseType.Modal)]
         public async Task<ActionResult> AppDrawer()
         {
-            var postList = await _postService.ReadAsync(UserHelper.UserId, string.Empty);
+            var postList = await _postService.ListByCategoryAsync(UserHelper.Id, string.Empty);
 
             var model = new AppDrawerViewModel
             {
diff --git a/Portal.CMS.Web/Areas/Admin/Controllers/CopyManagerController.cs b/PortalCMS.Web/Areas/Admin/Controllers/CopyManagerController.cs
similarity index 94%
rename from Portal.CMS.Web/Areas/Admin/Controllers/CopyManagerController.cs
rename to PortalCMS.Web/Areas/Admin/Controllers/CopyManagerController.cs
index dcc45e2..d014e1d 100644
--- a/Portal.CMS.Web/Areas/Admin/Controllers/CopyManagerController.cs
+++ b/PortalCMS.Web/Areas/Admin/Controllers/CopyManagerController.cs
@@ -1,12 +1,12 @@
-using Portal.CMS.Services.Copy;
-using Portal.CMS.Web.Architecture.ActionFilters;
-using Portal.CMS.Web.Architecture.Helpers;
-using Portal.CMS.Web.Areas.Admin.ViewModels.CopyManager;
+using PortalCMS.Services.Copy;
+using PortalCMS.Web.Architecture.ActionFilters;
+using PortalCMS.Web.Architecture.Helpers;
+using PortalCMS.Web.Areas.Admin.ViewModels.CopyManager;
 using System;
 using System.Threading.Tasks;
 using System.Web.Mvc;
 
-namespace Portal.CMS.Web.Areas.Admin.Controllers
+namespace PortalCMS.Web.Areas.Admin.Controllers
 {
     public class CopyManagerController : Controller
     {
diff --git a/Portal.CMS.Web/Areas/Admin/Controllers/DashboardController.cs b/PortalCMS.Web/Areas/Admin/Controllers/DashboardController.cs
similarity index 78%
rename from Portal.CMS.Web/Areas/Admin/Controllers/DashboardController.cs
rename to PortalCMS.Web/Areas/Admin/Controllers/DashboardController.cs
index b33185f..b4ec927 100644
--- a/Portal.CMS.Web/Areas/Admin/Controllers/DashboardController.cs
+++ b/PortalCMS.Web/Areas/Admin/Controllers/DashboardController.cs
@@ -1,11 +1,11 @@
-using Portal.CMS.Services.Generic;
-using Portal.CMS.Services.Posts;
-using Portal.CMS.Web.Architecture.ActionFilters;
-using Portal.CMS.Web.Areas.Admin.ViewModels.Dashboard;
+using PortalCMS.Services.Generic;
+using PortalCMS.Services.Posts;
+using PortalCMS.Web.Architecture.ActionFilters;
+using PortalCMS.Web.Areas.Admin.ViewModels.Dashboard;
 using System.Threading.Tasks;
 using System.Web.Mvc;
 
-namespace Portal.CMS.Web.Areas.Admin.Controllers
+namespace PortalCMS.Web.Areas.Admin.Controllers
 {
     [AdminFilter(ActionFilterResponseType.Page)]
     public class DashboardController : Controller
diff --git a/Portal.CMS.Web/Areas/Admin/Controllers/MediaManagerController.cs b/PortalCMS.Web/Areas/Admin/Controllers/MediaManagerController.cs
similarity index 95%
rename from Portal.CMS.Web/Areas/Admin/Controllers/MediaManagerController.cs
rename to PortalCMS.Web/Areas/Admin/Controllers/MediaManagerController.cs
index 74be50c..48525f4 100644
--- a/Portal.CMS.Web/Areas/Admin/Controllers/MediaManagerController.cs
+++ b/PortalCMS.Web/Areas/Admin/Controllers/MediaManagerController.cs
@@ -1,15 +1,15 @@
-using Portal.CMS.Services.Generic;
-using Portal.CMS.Services.Posts;
-using Portal.CMS.Services.Themes;
-using Portal.CMS.Web.Architecture.ActionFilters;
-using Portal.CMS.Web.Areas.Admin.ViewModels.MediaManager;
+using PortalCMS.Services.Generic;
+using PortalCMS.Services.Posts;
+using PortalCMS.Services.Themes;
+using PortalCMS.Web.Architecture.ActionFilters;
+using PortalCMS.Web.Areas.Admin.ViewModels.MediaManager;
 using System;
 using System.IO;
 using System.Threading.Tasks;
 using System.Web;
 using System.Web.Mvc;
 
-namespace Portal.CMS.Web.Areas.Admin.Controllers
+namespace PortalCMS.Web.Areas.Admin.Controllers
 {
     public class MediaManagerController : Controller
     {
diff --git a/Portal.CMS.Web/Areas/Admin/Controllers/MenuItemController.cs b/PortalCMS.Web/Areas/Admin/Controllers/MenuItemController.cs
similarity index 92%
rename from Portal.CMS.Web/Areas/Admin/Controllers/MenuItemController.cs
rename to PortalCMS.Web/Areas/Admin/Controllers/MenuItemController.cs
index a9fda8d..3aa729a 100644
--- a/Portal.CMS.Web/Areas/Admin/Controllers/MenuItemController.cs
+++ b/PortalCMS.Web/Areas/Admin/Controllers/MenuItemController.cs
@@ -1,14 +1,14 @@
-using Portal.CMS.Services.Authentication;
-using Portal.CMS.Services.Menu;
-using Portal.CMS.Services.PageBuilder;
-using Portal.CMS.Services.Posts;
-using Portal.CMS.Web.Architecture.ActionFilters;
-using Portal.CMS.Web.Areas.Admin.ViewModels.MenuItem;
+using PortalCMS.Services.Authentication;
+using PortalCMS.Services.Menu;
+using PortalCMS.Services.PageBuilder;
+using PortalCMS.Services.Posts;
+using PortalCMS.Web.Architecture.ActionFilters;
+using PortalCMS.Web.Areas.Admin.ViewModels.MenuItem;
 using System.Linq;
 using System.Threading.Tasks;
 using System.Web.Mvc;
 
-namespace Portal.CMS.Web.Areas.Admin.Controllers
+namespace PortalCMS.Web.Areas.Admin.Controllers
 {
     [AdminFilter(ActionFilterResponseType.Modal)]
     public class MenuItemController : Controller
@@ -83,7 +83,7 @@ public async Task<ActionResult> Edit(int menuItemId)
                 LinkIcon = menuItem.LinkIcon,
                 LinkURL = menuItem.LinkURL,
                 RoleList = await _roleService.GetAsync(),
-                SelectedRoleList = menuItem.MenuItemRoles.Select(x => x.Role.RoleName).ToList()
+                SelectedRoleList = menuItem.MenuItemRoles.Select(x => x.Role.Name).ToList()
             };
 
             return View(model);
diff --git a/PortalCMS.Web/Areas/Admin/Controllers/PageManagerController.cs b/PortalCMS.Web/Areas/Admin/Controllers/PageManagerController.cs
new file mode 100644
index 0000000..0b39b2c
--- /dev/null
+++ b/PortalCMS.Web/Areas/Admin/Controllers/PageManagerController.cs
@@ -0,0 +1,154 @@
+using PortalCMS.Entities.Enumerators;
+using PortalCMS.Services.Authentication;
+using PortalCMS.Services.PageBuilder;
+using PortalCMS.Web.Architecture.ActionFilters;
+using PortalCMS.Web.Architecture.Helpers;
+using PortalCMS.Web.Areas.Admin.ViewModels.PageManager;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using System.Web;
+using System.Web.Mvc;
+
+namespace PortalCMS.Web.Areas.Admin.Controllers
+{
+	[AdminFilter(ActionFilterResponseType.Page)]
+	public class PageManagerController : Controller
+	{
+		#region Dependencies
+
+		private readonly IPageService _pageService;
+		private readonly IRoleService _roleService;
+
+		public PageManagerController(IPageService pageService, IRoleService roleService)
+		{
+			_pageService = pageService;
+			_roleService = roleService;
+		}
+
+		#endregion Dependencies
+
+		[HttpGet]
+		public async Task<ActionResult> Index()
+		{
+			var model = new PagesViewModel
+			{
+				PageList = await _pageService.GetAsync(),
+				PageAreas = new List<string>()
+			};
+
+			foreach (var pageArea in model.PageList.GroupBy(x => x.PageArea))
+			{
+				if (pageArea.Key == null)
+					continue;
+
+				model.PageAreas.Add(pageArea.Key);
+			}
+
+			return View(model);
+		}
+
+		[HttpGet]
+		public async Task<ActionResult> Create()
+		{
+			var model = new CreateViewModel
+			{
+				RoleList = await _roleService.GetAsync()
+			};
+
+			return View("_Create", model);
+		}
+
+		[HttpPost]
+		[ValidateInput(false)]
+		[ValidateAntiForgeryToken]
+		public async Task<ActionResult> Create(CreateViewModel model)
+		{
+			if (!ModelState.IsValid)
+			{
+				model.RoleList = await _roleService.GetAsync();
+				return View("_Create", model);
+			}
+
+			var pageId = await _pageService.AddAsync(model.PageName, model.PageArea, model.PageController, model.PageAction);
+
+			await _pageService.RolesAsync(pageId, model.SelectedRoleList);
+
+			var cookie = new HttpCookie("PortalCMS_SSO", string.Join(",", UserHelper.Id, HttpContext.Request.Url.AbsoluteUri))
+			{
+				Expires = DateTime.Now.AddMinutes(5)
+			};
+
+			ControllerContext.HttpContext.Response.Cookies.Add(cookie);
+
+			HttpRuntime.UnloadAppDomain();
+
+			return Content("SSO");
+		}
+
+		[HttpGet]
+		public async Task<ActionResult> Edit(int pageId)
+		{
+			var page = await _pageService.GetAsync(pageId);
+
+			var model = new EditViewModel
+			{
+				PageId = page.PageId,
+				PageName = page.PageName,
+				PageArea = page.PageArea,
+				PageController = page.PageController,
+				PageAction = page.PageAction,
+				RoleList = await _roleService.GetAsync(),
+				SelectedRoleList = page.PageRoles.Select(x => x.Role.Name).ToList()
+			};
+
+			return View("_Edit", model);
+		}
+
+		[HttpPost]
+		[ValidateInput(false)]
+		[ValidateAntiForgeryToken]
+		public async Task<ActionResult> Edit(EditViewModel model)
+		{
+			var page = await _pageService.GetAsync(model.PageId);
+
+			var restartRequired = false || (!string.IsNullOrWhiteSpace(page.PageArea).Equals(string.IsNullOrWhiteSpace(model.PageArea)) || !page.PageController.Equals(model.PageController) || !page.PageAction.Equals(model.PageAction));
+
+			if (!ModelState.IsValid)
+			{
+				model.RoleList = await _roleService.GetAsync();
+				return View("_Edit", model);
+			}
+
+			await _pageService.EditAsync(model.PageId, model.PageName, model.PageArea, model.PageController, model.PageAction);
+
+			await _pageService.RolesAsync(model.PageId, model.SelectedRoleList);
+
+			// RESET: Routing by Starting the Website.
+			if (restartRequired)
+				HttpRuntime.UnloadAppDomain();
+
+			return Content("Refresh");
+		}
+
+		[HttpGet]
+		public async Task<ActionResult> Delete(int pageId)
+		{
+			await _pageService.DeleteAsync(pageId);
+
+			return RedirectToAction(nameof(Index));
+		}
+
+		[HttpGet]
+		public async Task<ActionResult> AppDrawer()
+		{
+			var model = new AppDrawerViewModel
+			{
+				PageList = await _pageService.GetAsync()
+			};
+
+			return PartialView("_AppDrawer", model);
+		}
+	}
+}
\ No newline at end of file
diff --git a/Portal.CMS.Web/Areas/Admin/Controllers/PostCategoriesController.cs b/PortalCMS.Web/Areas/Admin/Controllers/PostCategoriesController.cs
similarity index 91%
rename from Portal.CMS.Web/Areas/Admin/Controllers/PostCategoriesController.cs
rename to PortalCMS.Web/Areas/Admin/Controllers/PostCategoriesController.cs
index cf2a67a..3979eb0 100644
--- a/Portal.CMS.Web/Areas/Admin/Controllers/PostCategoriesController.cs
+++ b/PortalCMS.Web/Areas/Admin/Controllers/PostCategoriesController.cs
@@ -1,10 +1,10 @@
-using Portal.CMS.Services.Posts;
-using Portal.CMS.Web.Architecture.ActionFilters;
-using Portal.CMS.Web.Areas.Admin.ViewModels.PostCategories;
+using PortalCMS.Services.Posts;
+using PortalCMS.Web.Architecture.ActionFilters;
+using PortalCMS.Web.Areas.Admin.ViewModels.PostCategories;
 using System.Threading.Tasks;
 using System.Web.Mvc;
 
-namespace Portal.CMS.Web.Areas.Admin.Controllers
+namespace PortalCMS.Web.Areas.Admin.Controllers
 {
     public class PostCategoriesController : Controller
     {
diff --git a/Portal.CMS.Web/Areas/Admin/Controllers/QuickAccessController.cs b/PortalCMS.Web/Areas/Admin/Controllers/QuickAccessController.cs
similarity index 98%
rename from Portal.CMS.Web/Areas/Admin/Controllers/QuickAccessController.cs
rename to PortalCMS.Web/Areas/Admin/Controllers/QuickAccessController.cs
index dbaafc2..b316341 100644
--- a/Portal.CMS.Web/Areas/Admin/Controllers/QuickAccessController.cs
+++ b/PortalCMS.Web/Areas/Admin/Controllers/QuickAccessController.cs
@@ -1,10 +1,10 @@
-using Portal.CMS.Web.Architecture.ActionFilters;
-using Portal.CMS.Web.Architecture.Helpers;
-using Portal.CMS.Web.Areas.Admin.ViewModels.Dashboard;
+using PortalCMS.Web.Architecture.ActionFilters;
+using PortalCMS.Web.Architecture.Helpers;
+using PortalCMS.Web.Areas.Admin.ViewModels.Dashboard;
 using System;
 using System.Web.Mvc;
 
-namespace Portal.CMS.Web.Areas.Admin.Controllers
+namespace PortalCMS.Web.Areas.Admin.Controllers
 {
     [EditorFilter(ActionFilterResponseType.Page)]
     public class QuickAccessController : Controller
diff --git a/PortalCMS.Web/Areas/Admin/Controllers/RoleManagerController.cs b/PortalCMS.Web/Areas/Admin/Controllers/RoleManagerController.cs
new file mode 100644
index 0000000..374bc99
--- /dev/null
+++ b/PortalCMS.Web/Areas/Admin/Controllers/RoleManagerController.cs
@@ -0,0 +1,83 @@
+using PortalCMS.Services.Authentication;
+using PortalCMS.Web.Architecture.ActionFilters;
+using PortalCMS.Web.Areas.Admin.ViewModels.RoleManager;
+using System.Threading.Tasks;
+using System.Web.Mvc;
+
+namespace PortalCMS.Web.Areas.Admin.Controllers
+{
+	[AdminFilter(ActionFilterResponseType.Page)]
+	public class RoleManagerController : Controller
+	{
+		#region Dependencies
+
+		private readonly IRoleService _roleService;
+
+		public RoleManagerController(IRoleService roleService)
+		{
+			_roleService = roleService;
+		}
+
+		#endregion Dependencies
+
+		[HttpGet]
+		public ActionResult Index()
+		{
+			return RedirectToAction(nameof(Index), "SettingManager");
+		}
+
+		[HttpGet]
+		public ActionResult Create()
+		{
+			var model = new CreateViewModel();
+
+			return View("_Create", model);
+		}
+
+		[HttpPost]
+		[ValidateAntiForgeryToken]
+		public async Task<ActionResult> Create(CreateViewModel model)
+		{
+			if (!ModelState.IsValid)
+				return View("_Create", model);
+
+			await _roleService.AddAsync(model.RoleName);
+
+			return Content("Refresh");
+		}
+
+		[HttpGet]
+		public async Task<ActionResult> Edit(int roleId)
+		{
+			var role = await _roleService.GetAsync(roleId);
+
+			var model = new EditViewModel
+			{
+				RoleId = role.Id,
+				RoleName = role.Name
+			};
+
+			return View("_Edit", model);
+		}
+
+		[HttpPost]
+		[ValidateAntiForgeryToken]
+		public async Task<ActionResult> Edit(EditViewModel model)
+		{
+			if (!ModelState.IsValid)
+				return View("_Edit", model);
+
+			await _roleService.EditAsync(model.RoleId, model.RoleName);
+
+			return Content("Refresh");
+		}
+
+		[HttpGet]
+		public async Task<ActionResult> Delete(string roleId)
+		{
+			await _roleService.DeleteAsync(roleId);
+
+			return RedirectToAction(nameof(Index), "SettingManager");
+		}
+	}
+}
\ No newline at end of file
diff --git a/PortalCMS.Web/Areas/Admin/Controllers/SettingManagerController.cs b/PortalCMS.Web/Areas/Admin/Controllers/SettingManagerController.cs
new file mode 100644
index 0000000..a4d3dba
--- /dev/null
+++ b/PortalCMS.Web/Areas/Admin/Controllers/SettingManagerController.cs
@@ -0,0 +1,131 @@
+using PortalCMS.Entities.Enumerators;
+using PortalCMS.Services.Generic;
+using PortalCMS.Services.Settings;
+using PortalCMS.Web.Architecture.ActionFilters;
+using PortalCMS.Web.Architecture.Helpers;
+using PortalCMS.Web.Areas.Admin.ViewModels.SettingManager;
+using System;
+using System.IO;
+using System.Threading.Tasks;
+using System.Web;
+using System.Web.Mvc;
+
+namespace PortalCMS.Web.Areas.Admin.Controllers
+{
+	[AdminFilter(ActionFilterResponseType.Page)]
+	public class SettingManagerController : Controller
+	{
+		private const string IMAGE_DIRECTORY = "/Areas/Admin/Content/Media/";
+
+		#region Dependencies
+
+		private readonly ISettingService _settingService;
+		private readonly IImageService _imageService;
+
+		public SettingManagerController(ISettingService settingService, IImageService imageService)
+		{
+			_settingService = settingService;
+			_imageService = imageService;
+		}
+
+		#endregion Dependencies
+
+		[HttpGet]
+		public ActionResult Setup()
+		{
+			var model = new SetupViewModel
+			{
+				WebsiteName = SettingHelper.Get("Website Name"),
+				WebsiteDescription = SettingHelper.Get("Description Meta Tag"),
+				GoogleAnalyticsId = SettingHelper.Get("Google Analytics Tracking ID"),
+				EmailFromAddress = SettingHelper.Get("Email From Address"),
+				SendGridApiKey = SettingHelper.Get("SendGrid ApiKey"),
+				CDNAddress = SettingHelper.Get("CDN Address"),
+				RecaptchaSiteKey = SettingHelper.Get("Recaptcha Site Key"),
+				RecaptchaSecretKey = SettingHelper.Get("Recaptcha Secret Key"),
+			};
+
+			if (string.IsNullOrWhiteSpace(model.EmailFromAddress))
+				model.EmailFromAddress = UserHelper.Email;
+
+			return View("_Setup", model);
+		}
+
+		[HttpPost]
+		public async Task<ActionResult> Setup(SetupViewModel model, HttpPostedFileBase AttachedLogoImage, HttpPostedFileBase AttachedIconImage)
+		{
+			if (!ModelState.IsValid)
+				return View("_Setup", model);
+
+			await _settingService.EditAsync("Website Name", model.WebsiteName);
+			Session.Remove("Setting-Website Name");
+
+			if (AttachedLogoImage != null)
+			{
+				var imageFilePath = SaveImage(AttachedLogoImage);
+				await _imageService.CreateAsync(imageFilePath, ImageCategory.Logo);
+
+				await _settingService.EditAsync("Website Logo", imageFilePath);
+				Session.Remove("Setting-Website Logo");
+			}
+
+			if (AttachedIconImage != null)
+			{
+				var imageFilePath = SaveImage(AttachedIconImage);
+				await _imageService.CreateAsync(imageFilePath, ImageCategory.Logo);
+
+				await _settingService.EditAsync("Website FavIcon", imageFilePath);
+				Session.Remove("Setting-Website FavIcon");
+			}
+
+			await _settingService.EditAsync("Description Meta Tag", model.WebsiteDescription);
+			Session.Remove("Setting-Description Meta Tag");
+
+			await _settingService.EditAsync("Google Analytics Tracking ID", model.GoogleAnalyticsId);
+			Session.Remove("Setting-Google Analytics Tracking ID");
+
+			await _settingService.EditAsync("Email From Address", model.EmailFromAddress);
+			Session.Remove("Setting-Email From Address");
+
+			await _settingService.EditAsync("SendGrid ApiKey", model.SendGridApiKey);
+			Session.Remove("Setting-SendGrid ApiKey");
+
+			await _settingService.EditAsync("CDN Address", model.CDNAddress);
+			Session.Remove("Setting-CDN Address");
+
+			await _settingService.EditAsync("Recaptcha Site Key", model.RecaptchaSiteKey);
+			Session.Remove("Setting-Recaptcha Site Key");
+
+			await _settingService.EditAsync("Recaptcha Secret Key", model.RecaptchaSecretKey);
+			Session.Remove("Setting-Recaptcha Secret Key");
+
+			return Content("Refresh");
+		}
+
+		#region private methods
+
+		private string SaveImage(HttpPostedFileBase imageFile)
+		{
+			var extension = Path.GetExtension(imageFile.FileName).ToUpper();
+
+			if (extension != ".PNG" && extension != ".JPG" && extension != ".GIF")
+				throw new ArgumentException("Unexpected Image Format Provided");
+
+			var destinationDirectory = Path.Combine(Server.MapPath(IMAGE_DIRECTORY));
+
+			if (!Directory.Exists(destinationDirectory))
+				Directory.CreateDirectory(destinationDirectory);
+
+			var imageFileName = $"media-{DateTime.Now.ToString("ddMMyyyyHHmmss")}-{imageFile.FileName}";
+			var path = Path.Combine(Server.MapPath(IMAGE_DIRECTORY), imageFileName);
+
+			imageFile.SaveAs(path);
+
+			var relativeFilePath = $"{IMAGE_DIRECTORY}/{imageFileName}";
+
+			return relativeFilePath;
+		}
+
+		#endregion
+	}
+}
\ No newline at end of file
diff --git a/Portal.CMS.Web/Areas/Admin/Controllers/ThemeManagerController.cs b/PortalCMS.Web/Areas/Admin/Controllers/ThemeManagerController.cs
similarity index 95%
rename from Portal.CMS.Web/Areas/Admin/Controllers/ThemeManagerController.cs
rename to PortalCMS.Web/Areas/Admin/Controllers/ThemeManagerController.cs
index 0216f69..1fd5dc9 100644
--- a/Portal.CMS.Web/Areas/Admin/Controllers/ThemeManagerController.cs
+++ b/PortalCMS.Web/Areas/Admin/Controllers/ThemeManagerController.cs
@@ -1,14 +1,14 @@
-using Portal.CMS.Entities.Entities;
-using Portal.CMS.Services.Themes;
-using Portal.CMS.Web.Architecture.ActionFilters;
-using Portal.CMS.Web.Areas.Admin.ViewModels.ThemeManager;
+using PortalCMS.Entities.Entities;
+using PortalCMS.Services.Themes;
+using PortalCMS.Web.Architecture.ActionFilters;
+using PortalCMS.Web.Areas.Admin.ViewModels.ThemeManager;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using System.Web.Mvc;
 
-namespace Portal.CMS.Web.Areas.Admin.Controllers
+namespace PortalCMS.Web.Areas.Admin.Controllers
 {
     public class ThemeManagerController : Controller
     {
diff --git a/PortalCMS.Web/Areas/Admin/Controllers/UserManagerController.cs b/PortalCMS.Web/Areas/Admin/Controllers/UserManagerController.cs
new file mode 100644
index 0000000..8e49c08
--- /dev/null
+++ b/PortalCMS.Web/Areas/Admin/Controllers/UserManagerController.cs
@@ -0,0 +1,133 @@
+using PortalCMS.Services.Authentication;
+using PortalCMS.Web.Architecture.ActionFilters;
+using PortalCMS.Web.Architecture.Helpers;
+using PortalCMS.Web.Areas.Admin.ViewModels.UserManager;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using System.Web.Mvc;
+
+namespace PortalCMS.Web.Areas.Admin.Controllers
+{
+	[AdminFilter(ActionFilterResponseType.Page)]
+	public class UserManagerController : Controller
+	{
+		#region Dependencies
+
+		private readonly IUserService _userService;
+		private readonly IRegistrationService _registrationService;
+		private readonly IRoleService _roleService;
+
+		public UserManagerController(IUserService userService, IRegistrationService registrationService, IRoleService roleService)
+		{
+			_userService = userService;
+			_registrationService = registrationService;
+			_roleService = roleService;
+		}
+
+		#endregion Dependencies
+
+		[HttpGet]
+		public async Task<ActionResult> Index()
+		{
+			var model = new UsersViewModel
+			{
+				Users = await _userService.GetAsync()
+			};
+
+			return View(model);
+		}
+
+		[HttpGet]
+		public ActionResult Create()
+		{
+			return View("_Create", new CreateViewModel());
+		}
+
+		[HttpPost]
+		[ValidateAntiForgeryToken]
+		public async Task<ActionResult> Create(CreateViewModel model)
+		{
+			if (!ModelState.IsValid)
+				return View("_Create", model);
+
+			var userId = await _registrationService.RegisterAsync(model.EmailAddress, model.Password, model.GivenName, model.FamilyName);
+
+			switch (string.IsNullOrEmpty(userId))
+			{
+				case true:
+					ModelState.AddModelError("RegistrationError", "Unable to complete registration - please try again!");
+					return View("_Create", model);
+
+				default:
+					await _roleService.UpdateAsync(userId, new List<string> { "Authenticated" });
+					return Content("Refresh");
+			}
+		}
+
+		[HttpGet]
+		public async Task<ActionResult> Details(string userId)
+		{
+			var user = await _userService.GetAsync(userId);
+
+			var model = new DetailsViewModel
+			{
+				UserId = userId,
+				EmailAddress = user.Email,
+				GivenName = user.GivenName,
+				FamilyName = user.FamilyName,
+				DateAdded = user.RegistrationDate,
+				DateUpdated = user.LastUpdatedDate
+			};
+
+			return View("_Details", model);
+		}
+
+		[HttpPost]
+		public async Task<ActionResult> Details(DetailsViewModel model)
+		{
+			if (!ModelState.IsValid)
+				return View("_Details", model);
+
+			await _userService.UpdateDetailsAsync(model.UserId, model.EmailAddress, model.GivenName, model.FamilyName);
+
+			return Content("Refresh");
+		}
+
+		[HttpGet]
+		public async Task<ActionResult> Roles(string userId)
+		{
+			var model = new RolesViewModel
+			{
+				UserId = userId,
+				RoleList = await _roleService.GetUserAssignableRolesAsync()
+			};
+
+			var userRoles = await _roleService.GetByUserAsync(userId);
+
+			foreach (var role in userRoles)
+				model.SelectedRoleList.Add(role);
+
+			return PartialView("_Roles", model);
+		}
+
+		[HttpPost]
+		[ValidateAntiForgeryToken]
+		public async Task<ActionResult> Roles(RolesViewModel model)
+		{
+			if (!ModelState.IsValid)
+				return View("_Roles", model);
+
+			await _roleService.UpdateAsync(model.UserId, model.SelectedRoleList);
+
+			return Content("Refresh");
+		}
+
+		[HttpGet]
+		public async Task<ActionResult> Delete(string userId)
+		{
+			await _userService.DeleteUserAsync(userId);
+
+			return RedirectToAction(nameof(Index));
+		}
+	}
+}
\ No newline at end of file
diff --git a/Portal.CMS.Web/Areas/Admin/ViewModels/AnalyticManager/ChartViewModel.cs b/PortalCMS.Web/Areas/Admin/ViewModels/AnalyticManager/ChartViewModel.cs
similarity index 83%
rename from Portal.CMS.Web/Areas/Admin/ViewModels/AnalyticManager/ChartViewModel.cs
rename to PortalCMS.Web/Areas/Admin/ViewModels/AnalyticManager/ChartViewModel.cs
index f00d511..09cb3b0 100644
--- a/Portal.CMS.Web/Areas/Admin/ViewModels/AnalyticManager/ChartViewModel.cs
+++ b/PortalCMS.Web/Areas/Admin/ViewModels/AnalyticManager/ChartViewModel.cs
@@ -1,7 +1,7 @@
-using Portal.CMS.Entities.Enumerators;
+using PortalCMS.Entities.Enumerators;
 using System.Collections.Generic;
 
-namespace Portal.CMS.Web.Areas.Admin.ViewModels.AnalyticManager
+namespace PortalCMS.Web.Areas.Admin.ViewModels.AnalyticManager
 {
     public class ChartViewModel
     {
diff --git a/Portal.CMS.Web/Areas/Admin/ViewModels/AnalyticManager/ColumnViewModel.cs b/PortalCMS.Web/Areas/Admin/ViewModels/AnalyticManager/ColumnViewModel.cs
similarity index 74%
rename from Portal.CMS.Web/Areas/Admin/ViewModels/AnalyticManager/ColumnViewModel.cs
rename to PortalCMS.Web/Areas/Admin/ViewModels/AnalyticManager/ColumnViewModel.cs
index 4e48d8e..c51f177 100644
--- a/Portal.CMS.Web/Areas/Admin/ViewModels/AnalyticManager/ColumnViewModel.cs
+++ b/PortalCMS.Web/Areas/Admin/ViewModels/AnalyticManager/ColumnViewModel.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace Portal.CMS.Web.Areas.Admin.ViewModels.AnalyticManager
+namespace PortalCMS.Web.Areas.Admin.ViewModels.AnalyticManager
 {
     public class ColumnViewModel
     {
diff --git a/Portal.CMS.Web/Areas/Admin/ViewModels/AnalyticManager/LogEntriesViewModel.cs b/PortalCMS.Web/Areas/Admin/ViewModels/AnalyticManager/LogEntriesViewModel.cs
similarity index 74%
rename from Portal.CMS.Web/Areas/Admin/ViewModels/AnalyticManager/LogEntriesViewModel.cs
rename to PortalCMS.Web/Areas/Admin/ViewModels/AnalyticManager/LogEntriesViewModel.cs
index f2df361..61bc52f 100644
--- a/Portal.CMS.Web/Areas/Admin/ViewModels/AnalyticManager/LogEntriesViewModel.cs
+++ b/PortalCMS.Web/Areas/Admin/ViewModels/AnalyticManager/LogEntriesViewModel.cs
@@ -1,7 +1,7 @@
 using LogBook.Entities.Entities;
 using System.Collections.Generic;
 
-namespace Portal.CMS.Web.Areas.Admin.ViewModels.AnalyticManager
+namespace PortalCMS.Web.Areas.Admin.ViewModels.AnalyticManager
 {
     public class LogEntriesViewModel
     {
diff --git a/Portal.CMS.Web/Areas/Admin/ViewModels/AnalyticManager/ReviewExceptionViewModel.cs b/PortalCMS.Web/Areas/Admin/ViewModels/AnalyticManager/ReviewExceptionViewModel.cs
similarity index 69%
rename from Portal.CMS.Web/Areas/Admin/ViewModels/AnalyticManager/ReviewExceptionViewModel.cs
rename to PortalCMS.Web/Areas/Admin/ViewModels/AnalyticManager/ReviewExceptionViewModel.cs
index b24e9b3..3647a20 100644
--- a/Portal.CMS.Web/Areas/Admin/ViewModels/AnalyticManager/ReviewExceptionViewModel.cs
+++ b/PortalCMS.Web/Areas/Admin/ViewModels/AnalyticManager/ReviewExceptionViewModel.cs
@@ -1,4 +1,4 @@
-namespace Portal.CMS.Web.Areas.Admin.ViewModels.AnalyticManager
+namespace PortalCMS.Web.Areas.Admin.ViewModels.AnalyticManager
 {
     public class ReviewExceptionViewModel
     {
diff --git a/Portal.CMS.Web/Areas/Admin/ViewModels/BlogManager/AppDrawerViewModel.cs b/PortalCMS.Web/Areas/Admin/ViewModels/BlogManager/AppDrawerViewModel.cs
similarity index 57%
rename from Portal.CMS.Web/Areas/Admin/ViewModels/BlogManager/AppDrawerViewModel.cs
rename to PortalCMS.Web/Areas/Admin/ViewModels/BlogManager/AppDrawerViewModel.cs
index 7278555..1825eb2 100644
--- a/Portal.CMS.Web/Areas/Admin/ViewModels/BlogManager/AppDrawerViewModel.cs
+++ b/PortalCMS.Web/Areas/Admin/ViewModels/BlogManager/AppDrawerViewModel.cs
@@ -1,7 +1,7 @@
-using Portal.CMS.Entities.Entities;
+using PortalCMS.Entities.Entities;
 using System.Collections.Generic;
 
-namespace Portal.CMS.Web.Areas.Admin.ViewModels.BlogManager
+namespace PortalCMS.Web.Areas.Admin.ViewModels.BlogManager
 {
     public class AppDrawerViewModel
     {
diff --git a/Portal.CMS.Web/Areas/Admin/ViewModels/BlogManager/CreatePostViewModel.cs b/PortalCMS.Web/Areas/Admin/ViewModels/BlogManager/CreatePostViewModel.cs
similarity index 74%
rename from Portal.CMS.Web/Areas/Admin/ViewModels/BlogManager/CreatePostViewModel.cs
rename to PortalCMS.Web/Areas/Admin/ViewModels/BlogManager/CreatePostViewModel.cs
index 783d9dc..1d01e38 100644
--- a/Portal.CMS.Web/Areas/Admin/ViewModels/BlogManager/CreatePostViewModel.cs
+++ b/PortalCMS.Web/Areas/Admin/ViewModels/BlogManager/CreatePostViewModel.cs
@@ -1,11 +1,13 @@
-using Portal.CMS.Entities.Entities;
-using Portal.CMS.Entities.Enumerators;
-using Portal.CMS.Web.ViewModels.Shared;
+using Microsoft.AspNet.Identity.EntityFramework;
+using PortalCMS.Entities.Entities;
+using PortalCMS.Entities.Entities.Models;
+using PortalCMS.Entities.Enumerators;
+using PortalCMS.Web.ViewModels.Shared;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 
-namespace Portal.CMS.Web.Areas.Admin.ViewModels.BlogManager
+namespace PortalCMS.Web.Areas.Admin.ViewModels.BlogManager
 {
     public class CreatePostViewModel
     {
@@ -27,7 +29,7 @@ public class CreatePostViewModel
 
         [DisplayName("Author")]
         [Required]
-        public int PostAuthorUserId { get; set; }
+        public string PostAuthorUserId { get; set; }
 
         [DisplayName("Status")]
         public PublicationState PublicationState { get; set; }
@@ -51,9 +53,9 @@ public class CreatePostViewModel
 
         public IEnumerable<PostCategory> PostCategoryList { get; set; }
 
-        public IEnumerable<User> UserList { get; set; }
+        public IEnumerable<ApplicationUser> UserList { get; set; }
 
-        public List<Role> RoleList { get; set; }
+        public List<ApplicationRole> RoleList { get; set; }
 
         #endregion Enumerable Properties
     }
diff --git a/Portal.CMS.Web/Areas/Admin/ViewModels/BlogManager/EditPostviewModel.cs b/PortalCMS.Web/Areas/Admin/ViewModels/BlogManager/EditPostviewModel.cs
similarity index 75%
rename from Portal.CMS.Web/Areas/Admin/ViewModels/BlogManager/EditPostviewModel.cs
rename to PortalCMS.Web/Areas/Admin/ViewModels/BlogManager/EditPostviewModel.cs
index 93e278e..ab2aa73 100644
--- a/Portal.CMS.Web/Areas/Admin/ViewModels/BlogManager/EditPostviewModel.cs
+++ b/PortalCMS.Web/Areas/Admin/ViewModels/BlogManager/EditPostviewModel.cs
@@ -1,11 +1,13 @@
-using Portal.CMS.Entities.Entities;
-using Portal.CMS.Entities.Enumerators;
-using Portal.CMS.Web.ViewModels.Shared;
+using Microsoft.AspNet.Identity.EntityFramework;
+using PortalCMS.Entities.Entities;
+using PortalCMS.Entities.Entities.Models;
+using PortalCMS.Entities.Enumerators;
+using PortalCMS.Web.ViewModels.Shared;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 
-namespace Portal.CMS.Web.Areas.Admin.ViewModels.BlogManager
+namespace PortalCMS.Web.Areas.Admin.ViewModels.BlogManager
 {
     public class EditPostviewModel
     {
@@ -29,7 +31,7 @@ public class EditPostviewModel
 
         [DisplayName("Author")]
         [Required]
-        public int PostAuthorUserId { get; set; }
+        public string PostAuthorUserId { get; set; }
 
         [DisplayName("Status")]
         public PublicationState PublicationState { get; set; }
@@ -55,9 +57,9 @@ public class EditPostviewModel
 
         public IEnumerable<PostCategory> PostCategoryList { get; set; }
 
-        public IEnumerable<User> UserList { get; set; }
+        public IEnumerable<ApplicationUser> UserList { get; set; }
 
-        public List<Role> RoleList { get; set; }
+        public List<ApplicationRole> RoleList { get; set; }
 
         #endregion Enumerable Properties
     }
diff --git a/Portal.CMS.Web/Areas/Admin/ViewModels/BlogManager/PostsViewModel.cs b/PortalCMS.Web/Areas/Admin/ViewModels/BlogManager/PostsViewModel.cs
similarity index 66%
rename from Portal.CMS.Web/Areas/Admin/ViewModels/BlogManager/PostsViewModel.cs
rename to PortalCMS.Web/Areas/Admin/ViewModels/BlogManager/PostsViewModel.cs
index 66d949d..658f7e2 100644
--- a/Portal.CMS.Web/Areas/Admin/ViewModels/BlogManager/PostsViewModel.cs
+++ b/PortalCMS.Web/Areas/Admin/ViewModels/BlogManager/PostsViewModel.cs
@@ -1,7 +1,7 @@
-using Portal.CMS.Entities.Entities;
+using PortalCMS.Entities.Entities;
 using System.Collections.Generic;
 
-namespace Portal.CMS.Web.Areas.Admin.ViewModels.BlogManager
+namespace PortalCMS.Web.Areas.Admin.ViewModels.BlogManager
 {
     public class PostsViewModel
     {
diff --git a/Portal.CMS.Web/Areas/Admin/ViewModels/CopyManager/CopyViewModel.cs b/PortalCMS.Web/Areas/Admin/ViewModels/CopyManager/CopyViewModel.cs
similarity index 58%
rename from Portal.CMS.Web/Areas/Admin/ViewModels/CopyManager/CopyViewModel.cs
rename to PortalCMS.Web/Areas/Admin/ViewModels/CopyManager/CopyViewModel.cs
index 8e21787..6b68d30 100644
--- a/Portal.CMS.Web/Areas/Admin/ViewModels/CopyManager/CopyViewModel.cs
+++ b/PortalCMS.Web/Areas/Admin/ViewModels/CopyManager/CopyViewModel.cs
@@ -1,7 +1,7 @@
-using Portal.CMS.Entities.Entities;
+using PortalCMS.Entities.Entities;
 using System.Collections.Generic;
 
-namespace Portal.CMS.Web.Areas.Admin.ViewModels.CopyManager
+namespace PortalCMS.Web.Areas.Admin.ViewModels.CopyManager
 {
     public class CopyViewModel
     {
diff --git a/Portal.CMS.Web/Areas/Admin/ViewModels/CopyManager/CreateViewModel.cs b/PortalCMS.Web/Areas/Admin/ViewModels/CopyManager/CreateViewModel.cs
similarity index 84%
rename from Portal.CMS.Web/Areas/Admin/ViewModels/CopyManager/CreateViewModel.cs
rename to PortalCMS.Web/Areas/Admin/ViewModels/CopyManager/CreateViewModel.cs
index 7d0bd16..84ce60a 100644
--- a/Portal.CMS.Web/Areas/Admin/ViewModels/CopyManager/CreateViewModel.cs
+++ b/PortalCMS.Web/Areas/Admin/ViewModels/CopyManager/CreateViewModel.cs
@@ -1,7 +1,7 @@
 using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 
-namespace Portal.CMS.Web.Areas.Admin.ViewModels.CopyManager
+namespace PortalCMS.Web.Areas.Admin.ViewModels.CopyManager
 {
     public class CreateViewModel
     {
diff --git a/Portal.CMS.Web/Areas/Admin/ViewModels/CopyManager/EditViewModel.cs b/PortalCMS.Web/Areas/Admin/ViewModels/CopyManager/EditViewModel.cs
similarity index 85%
rename from Portal.CMS.Web/Areas/Admin/ViewModels/CopyManager/EditViewModel.cs
rename to PortalCMS.Web/Areas/Admin/ViewModels/CopyManager/EditViewModel.cs
index 88c36af..698ba95 100644
--- a/Portal.CMS.Web/Areas/Admin/ViewModels/CopyManager/EditViewModel.cs
+++ b/PortalCMS.Web/Areas/Admin/ViewModels/CopyManager/EditViewModel.cs
@@ -1,7 +1,7 @@
 using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 
-namespace Portal.CMS.Web.Areas.Admin.ViewModels.CopyManager
+namespace PortalCMS.Web.Areas.Admin.ViewModels.CopyManager
 {
     public class EditViewModel
     {
diff --git a/Portal.CMS.Web/Areas/Admin/ViewModels/Dashboard/DashboardViewModel.cs b/PortalCMS.Web/Areas/Admin/ViewModels/Dashboard/DashboardViewModel.cs
similarity index 64%
rename from Portal.CMS.Web/Areas/Admin/ViewModels/Dashboard/DashboardViewModel.cs
rename to PortalCMS.Web/Areas/Admin/ViewModels/Dashboard/DashboardViewModel.cs
index 57a2925..346788d 100644
--- a/Portal.CMS.Web/Areas/Admin/ViewModels/Dashboard/DashboardViewModel.cs
+++ b/PortalCMS.Web/Areas/Admin/ViewModels/Dashboard/DashboardViewModel.cs
@@ -1,7 +1,7 @@
-using Portal.CMS.Entities.Entities;
+using PortalCMS.Entities.Entities;
 using System.Collections.Generic;
 
-namespace Portal.CMS.Web.Areas.Admin.ViewModels.Dashboard
+namespace PortalCMS.Web.Areas.Admin.ViewModels.Dashboard
 {
     public class DashboardViewModel
     {
diff --git a/Portal.CMS.Web/Areas/Admin/ViewModels/Dashboard/QuickAccessViewModel.cs b/PortalCMS.Web/Areas/Admin/ViewModels/Dashboard/QuickAccessViewModel.cs
similarity index 95%
rename from Portal.CMS.Web/Areas/Admin/ViewModels/Dashboard/QuickAccessViewModel.cs
rename to PortalCMS.Web/Areas/Admin/ViewModels/Dashboard/QuickAccessViewModel.cs
index 71a307b..1dafb44 100644
--- a/Portal.CMS.Web/Areas/Admin/ViewModels/Dashboard/QuickAccessViewModel.cs
+++ b/PortalCMS.Web/Areas/Admin/ViewModels/Dashboard/QuickAccessViewModel.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace Portal.CMS.Web.Areas.Admin.ViewModels.Dashboard
+namespace PortalCMS.Web.Areas.Admin.ViewModels.Dashboard
 {
     public class QuickAccessViewModel
     {
diff --git a/Portal.CMS.Web/Areas/Admin/ViewModels/MediaManager/MediaViewModel.cs b/PortalCMS.Web/Areas/Admin/ViewModels/MediaManager/MediaViewModel.cs
similarity index 63%
rename from Portal.CMS.Web/Areas/Admin/ViewModels/MediaManager/MediaViewModel.cs
rename to PortalCMS.Web/Areas/Admin/ViewModels/MediaManager/MediaViewModel.cs
index 75ed53e..14743e3 100644
--- a/Portal.CMS.Web/Areas/Admin/ViewModels/MediaManager/MediaViewModel.cs
+++ b/PortalCMS.Web/Areas/Admin/ViewModels/MediaManager/MediaViewModel.cs
@@ -1,7 +1,7 @@
-using Portal.CMS.Entities.Entities;
+using PortalCMS.Entities.Entities;
 using System.Collections.Generic;
 
-namespace Portal.CMS.Web.Areas.Admin.ViewModels.MediaManager
+namespace PortalCMS.Web.Areas.Admin.ViewModels.MediaManager
 {
     public class MediaViewModel
     {
diff --git a/Portal.CMS.Web/Areas/Admin/ViewModels/MediaManager/UploadFontViewModel.cs b/PortalCMS.Web/Areas/Admin/ViewModels/MediaManager/UploadFontViewModel.cs
similarity index 88%
rename from Portal.CMS.Web/Areas/Admin/ViewModels/MediaManager/UploadFontViewModel.cs
rename to PortalCMS.Web/Areas/Admin/ViewModels/MediaManager/UploadFontViewModel.cs
index e095a8c..c63e7eb 100644
--- a/Portal.CMS.Web/Areas/Admin/ViewModels/MediaManager/UploadFontViewModel.cs
+++ b/PortalCMS.Web/Areas/Admin/ViewModels/MediaManager/UploadFontViewModel.cs
@@ -2,7 +2,7 @@
 using System.ComponentModel.DataAnnotations;
 using System.Web;
 
-namespace Portal.CMS.Web.Areas.Admin.ViewModels.MediaManager
+namespace PortalCMS.Web.Areas.Admin.ViewModels.MediaManager
 {
     public class UploadFontViewModel
     {
diff --git a/Portal.CMS.Web/Areas/Admin/ViewModels/MediaManager/UploadImageViewModel.cs b/PortalCMS.Web/Areas/Admin/ViewModels/MediaManager/UploadImageViewModel.cs
similarity index 79%
rename from Portal.CMS.Web/Areas/Admin/ViewModels/MediaManager/UploadImageViewModel.cs
rename to PortalCMS.Web/Areas/Admin/ViewModels/MediaManager/UploadImageViewModel.cs
index 54fce53..b2fbdc5 100644
--- a/Portal.CMS.Web/Areas/Admin/ViewModels/MediaManager/UploadImageViewModel.cs
+++ b/PortalCMS.Web/Areas/Admin/ViewModels/MediaManager/UploadImageViewModel.cs
@@ -1,9 +1,9 @@
-using Portal.CMS.Entities.Enumerators;
+using PortalCMS.Entities.Enumerators;
 using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 using System.Web;
 
-namespace Portal.CMS.Web.Areas.Admin.ViewModels.MediaManager
+namespace PortalCMS.Web.Areas.Admin.ViewModels.MediaManager
 {
     public class UploadImageViewModel
     {
diff --git a/Portal.CMS.Web/Areas/Admin/ViewModels/MenuItem/CreateViewModel.cs b/PortalCMS.Web/Areas/Admin/ViewModels/MenuItem/CreateViewModel.cs
similarity index 76%
rename from Portal.CMS.Web/Areas/Admin/ViewModels/MenuItem/CreateViewModel.cs
rename to PortalCMS.Web/Areas/Admin/ViewModels/MenuItem/CreateViewModel.cs
index 7b161a3..b7a61aa 100644
--- a/Portal.CMS.Web/Areas/Admin/ViewModels/MenuItem/CreateViewModel.cs
+++ b/PortalCMS.Web/Areas/Admin/ViewModels/MenuItem/CreateViewModel.cs
@@ -1,9 +1,11 @@
-using Portal.CMS.Entities.Entities;
+using Microsoft.AspNet.Identity.EntityFramework;
+using PortalCMS.Entities.Entities;
+using PortalCMS.Entities.Entities.Models;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 
-namespace Portal.CMS.Web.Areas.Admin.ViewModels.MenuItem
+namespace PortalCMS.Web.Areas.Admin.ViewModels.MenuItem
 {
     public class CreateViewModel
     {
@@ -25,7 +27,7 @@ public class CreateViewModel
         [DisplayName("Roles")]
         public List<string> SelectedRoleList { get; set; } = new List<string>();
 
-        public List<Role> RoleList { get; set; }
+        public List<ApplicationRole> RoleList { get; set; }
 
         public IEnumerable<MenuSystem> MenuList { get; set; }
 
diff --git a/Portal.CMS.Web/Areas/Admin/ViewModels/MenuItem/EditViewModel.cs b/PortalCMS.Web/Areas/Admin/ViewModels/MenuItem/EditViewModel.cs
similarity index 71%
rename from Portal.CMS.Web/Areas/Admin/ViewModels/MenuItem/EditViewModel.cs
rename to PortalCMS.Web/Areas/Admin/ViewModels/MenuItem/EditViewModel.cs
index 9670bd0..c2de2de 100644
--- a/Portal.CMS.Web/Areas/Admin/ViewModels/MenuItem/EditViewModel.cs
+++ b/PortalCMS.Web/Areas/Admin/ViewModels/MenuItem/EditViewModel.cs
@@ -1,9 +1,11 @@
-using Portal.CMS.Entities.Entities;
+using Microsoft.AspNet.Identity.EntityFramework;
+using PortalCMS.Entities.Entities;
+using PortalCMS.Entities.Entities.Models;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 
-namespace Portal.CMS.Web.Areas.Admin.ViewModels.MenuItem
+namespace PortalCMS.Web.Areas.Admin.ViewModels.MenuItem
 {
     public class EditViewModel
     {
@@ -25,6 +27,6 @@ public class EditViewModel
 
         public int MenuItemId { get; set; }
 
-        public List<Role> RoleList { get; set; }
+        public List<ApplicationRole> RoleList { get; set; }
     }
 }
\ No newline at end of file
diff --git a/Portal.CMS.Web/Areas/Admin/ViewModels/PageManager/AppDrawerViewModel.cs b/PortalCMS.Web/Areas/Admin/ViewModels/PageManager/AppDrawerViewModel.cs
similarity index 57%
rename from Portal.CMS.Web/Areas/Admin/ViewModels/PageManager/AppDrawerViewModel.cs
rename to PortalCMS.Web/Areas/Admin/ViewModels/PageManager/AppDrawerViewModel.cs
index a3a141d..a049dea 100644
--- a/Portal.CMS.Web/Areas/Admin/ViewModels/PageManager/AppDrawerViewModel.cs
+++ b/PortalCMS.Web/Areas/Admin/ViewModels/PageManager/AppDrawerViewModel.cs
@@ -1,7 +1,7 @@
-using Portal.CMS.Entities.Entities;
+using PortalCMS.Entities.Entities;
 using System.Collections.Generic;
 
-namespace Portal.CMS.Web.Areas.Admin.ViewModels.PageManager
+namespace PortalCMS.Web.Areas.Admin.ViewModels.PageManager
 {
     public class AppDrawerViewModel
     {
diff --git a/Portal.CMS.Web/Areas/Admin/ViewModels/PageManager/CreateViewModel.cs b/PortalCMS.Web/Areas/Admin/ViewModels/PageManager/CreateViewModel.cs
similarity index 72%
rename from Portal.CMS.Web/Areas/Admin/ViewModels/PageManager/CreateViewModel.cs
rename to PortalCMS.Web/Areas/Admin/ViewModels/PageManager/CreateViewModel.cs
index a17f9b6..808ee33 100644
--- a/Portal.CMS.Web/Areas/Admin/ViewModels/PageManager/CreateViewModel.cs
+++ b/PortalCMS.Web/Areas/Admin/ViewModels/PageManager/CreateViewModel.cs
@@ -1,9 +1,11 @@
-using Portal.CMS.Entities.Entities;
+using Microsoft.AspNet.Identity.EntityFramework;
+using PortalCMS.Entities.Entities;
+using PortalCMS.Entities.Entities.Models;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 
-namespace Portal.CMS.Web.Areas.Admin.ViewModels.PageManager
+namespace PortalCMS.Web.Areas.Admin.ViewModels.PageManager
 {
     public class CreateViewModel
     {
@@ -25,6 +27,6 @@ public class CreateViewModel
         [DisplayName("Roles")]
         public List<string> SelectedRoleList { get; set; } = new List<string>();
 
-        public List<Role> RoleList { get; set; }
+        public List<ApplicationRole> RoleList { get; set; }
     }
 }
\ No newline at end of file
diff --git a/Portal.CMS.Web/Areas/Admin/ViewModels/PageManager/EditViewModel.cs b/PortalCMS.Web/Areas/Admin/ViewModels/PageManager/EditViewModel.cs
similarity index 73%
rename from Portal.CMS.Web/Areas/Admin/ViewModels/PageManager/EditViewModel.cs
rename to PortalCMS.Web/Areas/Admin/ViewModels/PageManager/EditViewModel.cs
index 60d87a8..e4d37a4 100644
--- a/Portal.CMS.Web/Areas/Admin/ViewModels/PageManager/EditViewModel.cs
+++ b/PortalCMS.Web/Areas/Admin/ViewModels/PageManager/EditViewModel.cs
@@ -1,9 +1,11 @@
-using Portal.CMS.Entities.Entities;
+using Microsoft.AspNet.Identity.EntityFramework;
+using PortalCMS.Entities.Entities;
+using PortalCMS.Entities.Entities.Models;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 
-namespace Portal.CMS.Web.Areas.Admin.ViewModels.PageManager
+namespace PortalCMS.Web.Areas.Admin.ViewModels.PageManager
 {
     public class EditViewModel
     {
@@ -27,6 +29,6 @@ public class EditViewModel
         [DisplayName("Roles")]
         public List<string> SelectedRoleList { get; set; } = new List<string>();
 
-        public List<Role> RoleList { get; set; }
+        public List<ApplicationRole> RoleList { get; set; }
     }
 }
\ No newline at end of file
diff --git a/Portal.CMS.Web/Areas/Admin/ViewModels/PageManager/PagesViewModel.cs b/PortalCMS.Web/Areas/Admin/ViewModels/PageManager/PagesViewModel.cs
similarity index 65%
rename from Portal.CMS.Web/Areas/Admin/ViewModels/PageManager/PagesViewModel.cs
rename to PortalCMS.Web/Areas/Admin/ViewModels/PageManager/PagesViewModel.cs
index d754eaf..782aa69 100644
--- a/Portal.CMS.Web/Areas/Admin/ViewModels/PageManager/PagesViewModel.cs
+++ b/PortalCMS.Web/Areas/Admin/ViewModels/PageManager/PagesViewModel.cs
@@ -1,7 +1,7 @@
-using Portal.CMS.Entities.Entities;
+using PortalCMS.Entities.Entities;
 using System.Collections.Generic;
 
-namespace Portal.CMS.Web.Areas.Admin.ViewModels.PageManager
+namespace PortalCMS.Web.Areas.Admin.ViewModels.PageManager
 {
     public class PagesViewModel
     {
diff --git a/Portal.CMS.Web/Areas/Admin/ViewModels/PostCategories/AddViewModel.cs b/PortalCMS.Web/Areas/Admin/ViewModels/PostCategories/AddViewModel.cs
similarity index 78%
rename from Portal.CMS.Web/Areas/Admin/ViewModels/PostCategories/AddViewModel.cs
rename to PortalCMS.Web/Areas/Admin/ViewModels/PostCategories/AddViewModel.cs
index ee1308d..33771a0 100644
--- a/Portal.CMS.Web/Areas/Admin/ViewModels/PostCategories/AddViewModel.cs
+++ b/PortalCMS.Web/Areas/Admin/ViewModels/PostCategories/AddViewModel.cs
@@ -1,7 +1,7 @@
 using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 
-namespace Portal.CMS.Web.Areas.Admin.ViewModels.PostCategories
+namespace PortalCMS.Web.Areas.Admin.ViewModels.PostCategories
 {
     public class AddViewModel
     {
diff --git a/Portal.CMS.Web/Areas/Admin/ViewModels/PostCategories/EditViewModel.cs b/PortalCMS.Web/Areas/Admin/ViewModels/PostCategories/EditViewModel.cs
similarity index 81%
rename from Portal.CMS.Web/Areas/Admin/ViewModels/PostCategories/EditViewModel.cs
rename to PortalCMS.Web/Areas/Admin/ViewModels/PostCategories/EditViewModel.cs
index 3694ae2..d10cf1c 100644
--- a/Portal.CMS.Web/Areas/Admin/ViewModels/PostCategories/EditViewModel.cs
+++ b/PortalCMS.Web/Areas/Admin/ViewModels/PostCategories/EditViewModel.cs
@@ -1,7 +1,7 @@
 using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 
-namespace Portal.CMS.Web.Areas.Admin.ViewModels.PostCategories
+namespace PortalCMS.Web.Areas.Admin.ViewModels.PostCategories
 {
     public class EditViewModel
     {
diff --git a/Portal.CMS.Web/Areas/Admin/ViewModels/RoleManager/CreateViewModel.cs b/PortalCMS.Web/Areas/Admin/ViewModels/RoleManager/CreateViewModel.cs
similarity index 78%
rename from Portal.CMS.Web/Areas/Admin/ViewModels/RoleManager/CreateViewModel.cs
rename to PortalCMS.Web/Areas/Admin/ViewModels/RoleManager/CreateViewModel.cs
index 1b6fd2a..93e1e26 100644
--- a/Portal.CMS.Web/Areas/Admin/ViewModels/RoleManager/CreateViewModel.cs
+++ b/PortalCMS.Web/Areas/Admin/ViewModels/RoleManager/CreateViewModel.cs
@@ -1,7 +1,7 @@
 using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 
-namespace Portal.CMS.Web.Areas.Admin.ViewModels.RoleManager
+namespace PortalCMS.Web.Areas.Admin.ViewModels.RoleManager
 {
     public class CreateViewModel
     {
diff --git a/Portal.CMS.Web/Areas/Admin/ViewModels/RoleManager/EditViewModel.cs b/PortalCMS.Web/Areas/Admin/ViewModels/RoleManager/EditViewModel.cs
similarity index 68%
rename from Portal.CMS.Web/Areas/Admin/ViewModels/RoleManager/EditViewModel.cs
rename to PortalCMS.Web/Areas/Admin/ViewModels/RoleManager/EditViewModel.cs
index 73ea3be..993ec91 100644
--- a/Portal.CMS.Web/Areas/Admin/ViewModels/RoleManager/EditViewModel.cs
+++ b/PortalCMS.Web/Areas/Admin/ViewModels/RoleManager/EditViewModel.cs
@@ -1,11 +1,11 @@
 using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 
-namespace Portal.CMS.Web.Areas.Admin.ViewModels.RoleManager
+namespace PortalCMS.Web.Areas.Admin.ViewModels.RoleManager
 {
     public class EditViewModel
     {
-        public int RoleId { get; set; }
+        public string RoleId { get; set; }
 
         [Required]
         [DisplayName("Role Name")]
diff --git a/PortalCMS.Web/Areas/Admin/ViewModels/SettingManager/SetupViewModel.cs b/PortalCMS.Web/Areas/Admin/ViewModels/SettingManager/SetupViewModel.cs
new file mode 100644
index 0000000..a83f266
--- /dev/null
+++ b/PortalCMS.Web/Areas/Admin/ViewModels/SettingManager/SetupViewModel.cs
@@ -0,0 +1,40 @@
+using System.ComponentModel;
+using System.ComponentModel.DataAnnotations;
+
+namespace PortalCMS.Web.Areas.Admin.ViewModels.SettingManager
+{
+	public class SetupViewModel
+	{
+		[Required]
+		[DisplayName("Website Name")]
+		public string WebsiteName { get; set; }
+
+		[DisplayName("Website Logo")]
+		public string AttachedLogo { get; set; }
+
+		[DisplayName("Website Fav Icon")]
+		public string AttachedIcon { get; set; }
+
+		[Required]
+		[DisplayName("Website Description")]
+		public string WebsiteDescription { get; set; }
+
+		[DisplayName("Google Tracking Code")]
+		public string GoogleAnalyticsId { get; set; }
+
+		[DisplayName("Email From Address")]
+		public string EmailFromAddress { get; set; }
+
+		[DisplayName("SendGrid API Key")]
+		public string SendGridApiKey { get; set; }
+
+		[DisplayName("Recaptcha Site Key")]
+		public string RecaptchaSiteKey { get; set; }
+
+		[DisplayName("Recaptcha Secret Key")]
+		public string RecaptchaSecretKey { get; set; }
+
+		[DisplayName("CDN Address")]
+		public string CDNAddress { get; set; }
+	}
+}
\ No newline at end of file
diff --git a/Portal.CMS.Web/Areas/Admin/ViewModels/ThemeManager/AppDrawerViewModel.cs b/PortalCMS.Web/Areas/Admin/ViewModels/ThemeManager/AppDrawerViewModel.cs
similarity index 65%
rename from Portal.CMS.Web/Areas/Admin/ViewModels/ThemeManager/AppDrawerViewModel.cs
rename to PortalCMS.Web/Areas/Admin/ViewModels/ThemeManager/AppDrawerViewModel.cs
index f9b20c9..7f01df0 100644
--- a/Portal.CMS.Web/Areas/Admin/ViewModels/ThemeManager/AppDrawerViewModel.cs
+++ b/PortalCMS.Web/Areas/Admin/ViewModels/ThemeManager/AppDrawerViewModel.cs
@@ -1,7 +1,7 @@
-using Portal.CMS.Entities.Entities;
+using PortalCMS.Entities.Entities;
 using System.Collections.Generic;
 
-namespace Portal.CMS.Web.Areas.Admin.ViewModels.ThemeManager
+namespace PortalCMS.Web.Areas.Admin.ViewModels.ThemeManager
 {
     public class AppDrawerViewModel
     {
diff --git a/Portal.CMS.Web/Areas/Admin/ViewModels/ThemeManager/DefaultViewModel.cs b/PortalCMS.Web/Areas/Admin/ViewModels/ThemeManager/DefaultViewModel.cs
similarity index 58%
rename from Portal.CMS.Web/Areas/Admin/ViewModels/ThemeManager/DefaultViewModel.cs
rename to PortalCMS.Web/Areas/Admin/ViewModels/ThemeManager/DefaultViewModel.cs
index 4385f32..8f6ceff 100644
--- a/Portal.CMS.Web/Areas/Admin/ViewModels/ThemeManager/DefaultViewModel.cs
+++ b/PortalCMS.Web/Areas/Admin/ViewModels/ThemeManager/DefaultViewModel.cs
@@ -1,4 +1,4 @@
-namespace Portal.CMS.Web.Areas.Admin.ViewModels.ThemeManager
+namespace PortalCMS.Web.Areas.Admin.ViewModels.ThemeManager
 {
     public class DefaultViewModel
     {
diff --git a/Portal.CMS.Web/Areas/Admin/ViewModels/ThemeManager/ThemeViewModel.cs b/PortalCMS.Web/Areas/Admin/ViewModels/ThemeManager/ThemeViewModel.cs
similarity index 66%
rename from Portal.CMS.Web/Areas/Admin/ViewModels/ThemeManager/ThemeViewModel.cs
rename to PortalCMS.Web/Areas/Admin/ViewModels/ThemeManager/ThemeViewModel.cs
index 8352a81..2f12fb5 100644
--- a/Portal.CMS.Web/Areas/Admin/ViewModels/ThemeManager/ThemeViewModel.cs
+++ b/PortalCMS.Web/Areas/Admin/ViewModels/ThemeManager/ThemeViewModel.cs
@@ -1,7 +1,7 @@
-using Portal.CMS.Entities.Entities;
+using PortalCMS.Entities.Entities;
 using System.Collections.Generic;
 
-namespace Portal.CMS.Web.Areas.Admin.ViewModels.ThemeManager
+namespace PortalCMS.Web.Areas.Admin.ViewModels.ThemeManager
 {
     public class ThemeViewModel
     {
diff --git a/Portal.CMS.Web/Areas/Admin/ViewModels/ThemeManager/UpsertViewModel.cs b/PortalCMS.Web/Areas/Admin/ViewModels/ThemeManager/UpsertViewModel.cs
similarity index 94%
rename from Portal.CMS.Web/Areas/Admin/ViewModels/ThemeManager/UpsertViewModel.cs
rename to PortalCMS.Web/Areas/Admin/ViewModels/ThemeManager/UpsertViewModel.cs
index ca9e8f9..d6bef09 100644
--- a/Portal.CMS.Web/Areas/Admin/ViewModels/ThemeManager/UpsertViewModel.cs
+++ b/PortalCMS.Web/Areas/Admin/ViewModels/ThemeManager/UpsertViewModel.cs
@@ -1,9 +1,9 @@
-using Portal.CMS.Entities.Entities;
+using PortalCMS.Entities.Entities;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 
-namespace Portal.CMS.Web.Areas.Admin.ViewModels.ThemeManager
+namespace PortalCMS.Web.Areas.Admin.ViewModels.ThemeManager
 {
     public class UpsertViewModel
     {
diff --git a/Portal.CMS.Web/Areas/Admin/ViewModels/UserManager/CreateViewModel.cs b/PortalCMS.Web/Areas/Admin/ViewModels/UserManager/CreateViewModel.cs
similarity index 89%
rename from Portal.CMS.Web/Areas/Admin/ViewModels/UserManager/CreateViewModel.cs
rename to PortalCMS.Web/Areas/Admin/ViewModels/UserManager/CreateViewModel.cs
index 1844c3c..f72779e 100644
--- a/Portal.CMS.Web/Areas/Admin/ViewModels/UserManager/CreateViewModel.cs
+++ b/PortalCMS.Web/Areas/Admin/ViewModels/UserManager/CreateViewModel.cs
@@ -1,7 +1,7 @@
 using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 
-namespace Portal.CMS.Web.Areas.Admin.ViewModels.UserManager
+namespace PortalCMS.Web.Areas.Admin.ViewModels.UserManager
 {
     public class CreateViewModel
     {
diff --git a/PortalCMS.Web/Areas/Admin/ViewModels/UserManager/DeleteViewModel.cs b/PortalCMS.Web/Areas/Admin/ViewModels/UserManager/DeleteViewModel.cs
new file mode 100644
index 0000000..5676dd9
--- /dev/null
+++ b/PortalCMS.Web/Areas/Admin/ViewModels/UserManager/DeleteViewModel.cs
@@ -0,0 +1,7 @@
+namespace PortalCMS.Web.Areas.Admin.ViewModels.UserManager
+{
+    public class DeleteViewModel
+    {
+        public string UserId { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/PortalCMS.Web/Areas/Admin/ViewModels/UserManager/DetailsViewModel.cs b/PortalCMS.Web/Areas/Admin/ViewModels/UserManager/DetailsViewModel.cs
new file mode 100644
index 0000000..41f10a0
--- /dev/null
+++ b/PortalCMS.Web/Areas/Admin/ViewModels/UserManager/DetailsViewModel.cs
@@ -0,0 +1,28 @@
+using System;
+using System.ComponentModel;
+using System.ComponentModel.DataAnnotations;
+
+namespace PortalCMS.Web.Areas.Admin.ViewModels.UserManager
+{
+	public class DetailsViewModel
+	{
+		public string UserId { get; set; }
+
+		[Required]
+		[DisplayName("Email")]
+		public string EmailAddress { get; set; }
+
+		[Required]
+		[DisplayName("First Name")]
+		public string GivenName { get; set; }
+
+		[Required]
+		[DisplayName("Last Name")]
+		public string FamilyName { get; set; }
+
+		[DisplayName("Registered")]
+		public DateTime DateAdded { get; set; }
+
+		public DateTime DateUpdated { get; set; }
+	}
+}
\ No newline at end of file
diff --git a/PortalCMS.Web/Areas/Admin/ViewModels/UserManager/RolesViewModel.cs b/PortalCMS.Web/Areas/Admin/ViewModels/UserManager/RolesViewModel.cs
new file mode 100644
index 0000000..c675c88
--- /dev/null
+++ b/PortalCMS.Web/Areas/Admin/ViewModels/UserManager/RolesViewModel.cs
@@ -0,0 +1,17 @@
+using PortalCMS.Entities.Entities;
+using PortalCMS.Entities.Entities.Models;
+using System.Collections.Generic;
+using System.ComponentModel;
+
+namespace PortalCMS.Web.Areas.Admin.ViewModels.UserManager
+{
+    public class RolesViewModel
+    {
+        public string UserId { get; set; }
+
+        [DisplayName("Roles")]
+        public List<string> SelectedRoleList { get; set; } = new List<string>();
+
+        public List<ApplicationRole> RoleList { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/PortalCMS.Web/Areas/Admin/ViewModels/UserManager/UsersViewModel.cs b/PortalCMS.Web/Areas/Admin/ViewModels/UserManager/UsersViewModel.cs
new file mode 100644
index 0000000..f2fd399
--- /dev/null
+++ b/PortalCMS.Web/Areas/Admin/ViewModels/UserManager/UsersViewModel.cs
@@ -0,0 +1,10 @@
+using PortalCMS.Entities.Entities.Models;
+using System.Collections.Generic;
+
+namespace PortalCMS.Web.Areas.Admin.ViewModels.UserManager
+{
+	public class UsersViewModel
+    {
+        public IEnumerable<ApplicationUser> Users { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/Portal.CMS.Web/Areas/Admin/Views/AnalyticManager/Index.cshtml b/PortalCMS.Web/Areas/Admin/Views/AnalyticManager/Index.cshtml
similarity index 98%
rename from Portal.CMS.Web/Areas/Admin/Views/AnalyticManager/Index.cshtml
rename to PortalCMS.Web/Areas/Admin/Views/AnalyticManager/Index.cshtml
index b7cfdf5..6112b72 100644
--- a/Portal.CMS.Web/Areas/Admin/Views/AnalyticManager/Index.cshtml
+++ b/PortalCMS.Web/Areas/Admin/Views/AnalyticManager/Index.cshtml
@@ -1,4 +1,4 @@
-@model Portal.CMS.Web.Areas.Admin.ViewModels.PageManager.PagesViewModel
+@model PortalCMS.Web.Areas.Admin.ViewModels.PageManager.PagesViewModel
 @{
     ViewBag.Title = "Analytic Manager";
     ViewBag.Icon = "/Areas/Admin/Content/Images/icon-reports.png";
diff --git a/Portal.CMS.Web/Areas/Admin/Views/AnalyticManager/LogEntries.cshtml b/PortalCMS.Web/Areas/Admin/Views/AnalyticManager/LogEntries.cshtml
similarity index 95%
rename from Portal.CMS.Web/Areas/Admin/Views/AnalyticManager/LogEntries.cshtml
rename to PortalCMS.Web/Areas/Admin/Views/AnalyticManager/LogEntries.cshtml
index 3d6c6c3..c657aa9 100644
--- a/Portal.CMS.Web/Areas/Admin/Views/AnalyticManager/LogEntries.cshtml
+++ b/PortalCMS.Web/Areas/Admin/Views/AnalyticManager/LogEntries.cshtml
@@ -1,4 +1,4 @@
-@model Portal.CMS.Web.Areas.Admin.ViewModels.AnalyticManager.LogEntriesViewModel
+@model PortalCMS.Web.Areas.Admin.ViewModels.AnalyticManager.LogEntriesViewModel
 @{
     ViewBag.Title = "Latest Log Entries";
     ViewBag.Icon = "/Areas/Admin/Content/Images/icon-reports.png";
diff --git a/Portal.CMS.Web/Areas/Admin/Views/AnalyticManager/ReviewException.cshtml b/PortalCMS.Web/Areas/Admin/Views/AnalyticManager/ReviewException.cshtml
similarity index 73%
rename from Portal.CMS.Web/Areas/Admin/Views/AnalyticManager/ReviewException.cshtml
rename to PortalCMS.Web/Areas/Admin/Views/AnalyticManager/ReviewException.cshtml
index 6c3ef2b..9eace41 100644
--- a/Portal.CMS.Web/Areas/Admin/Views/AnalyticManager/ReviewException.cshtml
+++ b/PortalCMS.Web/Areas/Admin/Views/AnalyticManager/ReviewException.cshtml
@@ -1,4 +1,4 @@
-@model Portal.CMS.Web.Areas.Admin.ViewModels.AnalyticManager.ReviewExceptionViewModel
+@model PortalCMS.Web.Areas.Admin.ViewModels.AnalyticManager.ReviewExceptionViewModel
 @{
     ViewBag.Title = "Review Exception";
     Layout = "";
diff --git a/Portal.CMS.Web/Areas/Admin/Views/AnalyticManager/_DisplayChart.cshtml b/PortalCMS.Web/Areas/Admin/Views/AnalyticManager/_DisplayChart.cshtml
similarity index 94%
rename from Portal.CMS.Web/Areas/Admin/Views/AnalyticManager/_DisplayChart.cshtml
rename to PortalCMS.Web/Areas/Admin/Views/AnalyticManager/_DisplayChart.cshtml
index 65474f4..df0ca1b 100644
--- a/Portal.CMS.Web/Areas/Admin/Views/AnalyticManager/_DisplayChart.cshtml
+++ b/PortalCMS.Web/Areas/Admin/Views/AnalyticManager/_DisplayChart.cshtml
@@ -1,4 +1,4 @@
-@model Portal.CMS.Web.Areas.Admin.ViewModels.AnalyticManager.ChartViewModel
+@model PortalCMS.Web.Areas.Admin.ViewModels.AnalyticManager.ChartViewModel
 @{
     string bootstrapSelector = string.Empty;
 
diff --git a/Portal.CMS.Web/Areas/Admin/Views/BlogManager/Index.cshtml b/PortalCMS.Web/Areas/Admin/Views/BlogManager/Index.cshtml
similarity index 98%
rename from Portal.CMS.Web/Areas/Admin/Views/BlogManager/Index.cshtml
rename to PortalCMS.Web/Areas/Admin/Views/BlogManager/Index.cshtml
index 2f87b1e..e354fba 100644
--- a/Portal.CMS.Web/Areas/Admin/Views/BlogManager/Index.cshtml
+++ b/PortalCMS.Web/Areas/Admin/Views/BlogManager/Index.cshtml
@@ -1,4 +1,4 @@
-@model Portal.CMS.Web.Areas.Admin.ViewModels.BlogManager.PostsViewModel
+@model PortalCMS.Web.Areas.Admin.ViewModels.BlogManager.PostsViewModel
 @{
     ViewBag.Title = "Blog Manager";
     ViewBag.Icon = "/Areas/Admin/Content/Images/icon-articles.png";
diff --git a/Portal.CMS.Web/Areas/Admin/Views/BlogManager/_AppDrawer.cshtml b/PortalCMS.Web/Areas/Admin/Views/BlogManager/_AppDrawer.cshtml
similarity index 96%
rename from Portal.CMS.Web/Areas/Admin/Views/BlogManager/_AppDrawer.cshtml
rename to PortalCMS.Web/Areas/Admin/Views/BlogManager/_AppDrawer.cshtml
index ea37f08..5d7fc0c 100644
--- a/Portal.CMS.Web/Areas/Admin/Views/BlogManager/_AppDrawer.cshtml
+++ b/PortalCMS.Web/Areas/Admin/Views/BlogManager/_AppDrawer.cshtml
@@ -1,4 +1,4 @@
-@model Portal.CMS.Web.Areas.Admin.ViewModels.BlogManager.AppDrawerViewModel
+@model PortalCMS.Web.Areas.Admin.ViewModels.BlogManager.AppDrawerViewModel
 @{
     Layout = "";
 }
diff --git a/Portal.CMS.Web/Areas/Admin/Views/BlogManager/_Create.cshtml b/PortalCMS.Web/Areas/Admin/Views/BlogManager/_Create.cshtml
similarity index 93%
rename from Portal.CMS.Web/Areas/Admin/Views/BlogManager/_Create.cshtml
rename to PortalCMS.Web/Areas/Admin/Views/BlogManager/_Create.cshtml
index 3ad3b3c..921475c 100644
--- a/Portal.CMS.Web/Areas/Admin/Views/BlogManager/_Create.cshtml
+++ b/PortalCMS.Web/Areas/Admin/Views/BlogManager/_Create.cshtml
@@ -1,4 +1,4 @@
-@model Portal.CMS.Web.Areas.Admin.ViewModels.BlogManager.CreatePostViewModel
+@model PortalCMS.Web.Areas.Admin.ViewModels.BlogManager.CreatePostViewModel
 @{
     ViewBag.Title = "Create Post";
     Layout = "";
@@ -6,7 +6,7 @@
     var textareaSelector = DateTime.Now.ToString("ddMMyyyyHHmmss");
 
     var postCategoryList = Model.PostCategoryList.Select(x => new SelectListItem { Value = x.PostCategoryId.ToString(), Text = x.PostCategoryName });
-    var userList = Model.UserList.Select(x => new SelectListItem { Value = x.UserId.ToString(), Text = string.Format("{0} {1}", x.GivenName, x.FamilyName) });
+    var userList = Model.UserList.Select(x => new SelectListItem { Value = x.Id.ToString(), Text = string.Format("{0} {1}", x.GivenName, x.FamilyName) });
 }
 
 @Scripts.Render("~/Plugins/ImageSelector/Scripts")
@@ -84,7 +84,7 @@
             <div class="alert alert-warning" role="alert">A user must have at least one of the roles selected below to see this Post. To show the Post to all users select no roles.</div>
             <div class="control-group control-textarea float-container">
                 @Html.LabelFor(x => x.SelectedRoleList)
-                @Html.ListBoxFor(m => m.SelectedRoleList, Model.RoleList.Select(r => new SelectListItem { Text = r.RoleName, Value = r.RoleName.ToString(), Selected = Model.SelectedRoleList != null && Model.SelectedRoleList.Contains(r.RoleName) }))
+                @Html.ListBoxFor(m => m.SelectedRoleList, Model.RoleList.Select(r => new SelectListItem { Text = r.Name, Value = r.Name.ToString(), Selected = Model.SelectedRoleList != null && Model.SelectedRoleList.Contains(r.Name) }))
             </div>
         </div>
         <div role="tabpanel" class="tab-pane" id="tab-banner">
diff --git a/Portal.CMS.Web/Areas/Admin/Views/BlogManager/_Edit.cshtml b/PortalCMS.Web/Areas/Admin/Views/BlogManager/_Edit.cshtml
similarity index 93%
rename from Portal.CMS.Web/Areas/Admin/Views/BlogManager/_Edit.cshtml
rename to PortalCMS.Web/Areas/Admin/Views/BlogManager/_Edit.cshtml
index 366c57e..bfa12fd 100644
--- a/Portal.CMS.Web/Areas/Admin/Views/BlogManager/_Edit.cshtml
+++ b/PortalCMS.Web/Areas/Admin/Views/BlogManager/_Edit.cshtml
@@ -1,10 +1,10 @@
-@model Portal.CMS.Web.Areas.Admin.ViewModels.BlogManager.EditPostviewModel
+@model PortalCMS.Web.Areas.Admin.ViewModels.BlogManager.EditPostviewModel
 @{
     Layout = "";
     var textareaSelector = DateTime.Now.ToString("ddMMyyyyHHmmss");
 
     var postCategoryList = Model.PostCategoryList.Select(x => new SelectListItem { Value = x.PostCategoryId.ToString(), Text = x.PostCategoryName });
-    var userList = Model.UserList.Select(x => new SelectListItem { Value = x.UserId.ToString(), Text = string.Format("{0} {1}", x.GivenName, x.FamilyName) });
+    var userList = Model.UserList.Select(x => new SelectListItem { Value = x.Id.ToString(), Text = string.Format("{0} {1}", x.GivenName, x.FamilyName) });
 }
 
 @Scripts.Render("~/Plugins/ImageSelector/Scripts")
@@ -85,7 +85,7 @@
             <div class="alert alert-warning" role="alert">A user must have at least one of the roles selected below to see this Post. To show the Post to all users select no roles.</div>
             <div class="control-group control-textarea float-container">
                 @Html.LabelFor(x => x.SelectedRoleList)
-                @Html.ListBoxFor(m => m.SelectedRoleList, Model.RoleList.Select(r => new SelectListItem { Text = r.RoleName, Value = r.RoleName.ToString(), Selected = Model.SelectedRoleList != null && Model.SelectedRoleList.Contains(r.RoleName) }))
+                @Html.ListBoxFor(m => m.SelectedRoleList, Model.RoleList.Select(r => new SelectListItem { Text = r.Name, Value = r.Name.ToString(), Selected = Model.SelectedRoleList != null && Model.SelectedRoleList.Contains(r.Name) }))
             </div>
         </div>
         <div role="tabpanel" class="tab-pane" id="tab-banner">
diff --git a/Portal.CMS.Web/Areas/Admin/Views/CopyManager/Index.cshtml b/PortalCMS.Web/Areas/Admin/Views/CopyManager/Index.cshtml
similarity index 94%
rename from Portal.CMS.Web/Areas/Admin/Views/CopyManager/Index.cshtml
rename to PortalCMS.Web/Areas/Admin/Views/CopyManager/Index.cshtml
index d76173e..10961d0 100644
--- a/Portal.CMS.Web/Areas/Admin/Views/CopyManager/Index.cshtml
+++ b/PortalCMS.Web/Areas/Admin/Views/CopyManager/Index.cshtml
@@ -1,4 +1,4 @@
-@model Portal.CMS.Web.Areas.Admin.ViewModels.CopyManager.CopyViewModel
+@model PortalCMS.Web.Areas.Admin.ViewModels.CopyManager.CopyViewModel
 @{
     ViewBag.Title = "Manage Copy";
     ViewBag.Icon = "/Areas/Admin/Content/Images/icon-copy.png";
diff --git a/Portal.CMS.Web/Areas/Admin/Views/CopyManager/_Copy.cshtml b/PortalCMS.Web/Areas/Admin/Views/CopyManager/_Copy.cshtml
similarity index 96%
rename from Portal.CMS.Web/Areas/Admin/Views/CopyManager/_Copy.cshtml
rename to PortalCMS.Web/Areas/Admin/Views/CopyManager/_Copy.cshtml
index f7c3195..802a0e0 100644
--- a/Portal.CMS.Web/Areas/Admin/Views/CopyManager/_Copy.cshtml
+++ b/PortalCMS.Web/Areas/Admin/Views/CopyManager/_Copy.cshtml
@@ -1,4 +1,4 @@
-@model Portal.CMS.Entities.Entities.CopyItem
+@model PortalCMS.Entities.Entities.CopyItem
 @{
     Layout = "";
 
diff --git a/Portal.CMS.Web/Areas/Admin/Views/CopyManager/_Create.cshtml b/PortalCMS.Web/Areas/Admin/Views/CopyManager/_Create.cshtml
similarity index 95%
rename from Portal.CMS.Web/Areas/Admin/Views/CopyManager/_Create.cshtml
rename to PortalCMS.Web/Areas/Admin/Views/CopyManager/_Create.cshtml
index 023820c..6b3ff84 100644
--- a/Portal.CMS.Web/Areas/Admin/Views/CopyManager/_Create.cshtml
+++ b/PortalCMS.Web/Areas/Admin/Views/CopyManager/_Create.cshtml
@@ -1,4 +1,4 @@
-@model Portal.CMS.Web.Areas.Admin.ViewModels.CopyManager.CreateViewModel
+@model PortalCMS.Web.Areas.Admin.ViewModels.CopyManager.CreateViewModel
 @{
     Layout = "";
     var textareaSelector = DateTime.Now.ToString("ddMMyyyyHHmmss");
diff --git a/Portal.CMS.Web/Areas/Admin/Views/CopyManager/_Edit.cshtml b/PortalCMS.Web/Areas/Admin/Views/CopyManager/_Edit.cshtml
similarity index 95%
rename from Portal.CMS.Web/Areas/Admin/Views/CopyManager/_Edit.cshtml
rename to PortalCMS.Web/Areas/Admin/Views/CopyManager/_Edit.cshtml
index 8fd6543..7eb9593 100644
--- a/Portal.CMS.Web/Areas/Admin/Views/CopyManager/_Edit.cshtml
+++ b/PortalCMS.Web/Areas/Admin/Views/CopyManager/_Edit.cshtml
@@ -1,4 +1,4 @@
-@model Portal.CMS.Web.Areas.Admin.ViewModels.CopyManager.EditViewModel
+@model PortalCMS.Web.Areas.Admin.ViewModels.CopyManager.EditViewModel
 @{
     Layout = "";
     var textareaSelector = DateTime.Now.ToString("ddMMyyyyHHmmss");
diff --git a/Portal.CMS.Web/Areas/Admin/Views/Dashboard/Index.cshtml b/PortalCMS.Web/Areas/Admin/Views/Dashboard/Index.cshtml
similarity index 93%
rename from Portal.CMS.Web/Areas/Admin/Views/Dashboard/Index.cshtml
rename to PortalCMS.Web/Areas/Admin/Views/Dashboard/Index.cshtml
index ccf2871..be08cc1 100644
--- a/Portal.CMS.Web/Areas/Admin/Views/Dashboard/Index.cshtml
+++ b/PortalCMS.Web/Areas/Admin/Views/Dashboard/Index.cshtml
@@ -1,4 +1,4 @@
-@model Portal.CMS.Web.Areas.Admin.ViewModels.Dashboard.DashboardViewModel
+@model PortalCMS.Web.Areas.Admin.ViewModels.Dashboard.DashboardViewModel
 @{
     ViewBag.Title = "Dashboard";
     ViewBag.Icon = "/Areas/Admin/Content/Images/icon-dashboard.png";
diff --git a/Portal.CMS.Web/Areas/Admin/Views/Dashboard/_LatestPost.cshtml b/PortalCMS.Web/Areas/Admin/Views/Dashboard/_LatestPost.cshtml
similarity index 90%
rename from Portal.CMS.Web/Areas/Admin/Views/Dashboard/_LatestPost.cshtml
rename to PortalCMS.Web/Areas/Admin/Views/Dashboard/_LatestPost.cshtml
index 74c5736..50b70ce 100644
--- a/Portal.CMS.Web/Areas/Admin/Views/Dashboard/_LatestPost.cshtml
+++ b/PortalCMS.Web/Areas/Admin/Views/Dashboard/_LatestPost.cshtml
@@ -1,4 +1,4 @@
-@model Portal.CMS.Entities.Entities.Post
+@model PortalCMS.Entities.Entities.Post
 
 @if (Model != null)
 {
@@ -23,14 +23,16 @@
 else
 {
     <div class="col-xs-12 col-md-6 col-lg-4">
-        <div class="box">
+        <div class="box box-tall">
             <div class="box-title">Latest Post</div>
 
             <h3>No Posts Found</h3>
             <p>You haven't created any Posts yet, but don't worry as soon as you do it will show up on your Dashboard.</p>
 
             <div class="admin-container x1">
-                <a href="@Url.Action("Create", "BlogManager")" class="admin-item launch-modal" data-title="Create Post" data-toggle="popover" data-trigger="hover" data-container="body" data-placement="top" data-content="Create a new Post."><span class="fa fa-plus"></span>Create Post</a>
+                <a href="@Url.Action("Create", "BlogManager")" class="admin-item launch-modal" data-title="Create Post" data-toggle="popover" data-trigger="hover" data-container="body" data-placement="top" data-content="Create a new Post.">
+									<span class="fa fa-plus"></span>Create Post
+								</a>
             </div>
         </div>
     </div>
diff --git a/Portal.CMS.Web/Areas/Admin/Views/Dashboard/_MediaManager.cshtml b/PortalCMS.Web/Areas/Admin/Views/Dashboard/_MediaManager.cshtml
similarity index 96%
rename from Portal.CMS.Web/Areas/Admin/Views/Dashboard/_MediaManager.cshtml
rename to PortalCMS.Web/Areas/Admin/Views/Dashboard/_MediaManager.cshtml
index 5cea4ae..702ba74 100644
--- a/Portal.CMS.Web/Areas/Admin/Views/Dashboard/_MediaManager.cshtml
+++ b/PortalCMS.Web/Areas/Admin/Views/Dashboard/_MediaManager.cshtml
@@ -1,4 +1,4 @@
-@model List<Portal.CMS.Entities.Entities.Image>
+@model List<PortalCMS.Entities.Entities.Image>
 
 @if (Model == null || !Model.Any())
 {
diff --git a/Portal.CMS.Web/Areas/Admin/Views/Dashboard/_MyAccount.cshtml b/PortalCMS.Web/Areas/Admin/Views/Dashboard/_MyAccount.cshtml
similarity index 59%
rename from Portal.CMS.Web/Areas/Admin/Views/Dashboard/_MyAccount.cshtml
rename to PortalCMS.Web/Areas/Admin/Views/Dashboard/_MyAccount.cshtml
index a8ede0d..f7c3b02 100644
--- a/Portal.CMS.Web/Areas/Admin/Views/Dashboard/_MyAccount.cshtml
+++ b/PortalCMS.Web/Areas/Admin/Views/Dashboard/_MyAccount.cshtml
@@ -3,19 +3,18 @@
         <div class="box-title">My Account</div>
 
         <div class="row" style="height: 150px; padding-top: 40px;">
-            <div class="col-xs-5 vertical-alignment">
-                <img class="avatar" alt="My Avatar" src="@UserHelper.AvatarImagePath" />
-            </div>
+					<div class="col-xs-5 vertical-alignment">
+						<img class="avatar" alt="My Avatar" src="data:image/jpeg;base64,@Convert.ToBase64String(UserHelper.AvatarImage)" />
+					</div>
             <div class="col-xs-7 vertical-alignment" style="text-align: left;">
                 <h3>@UserHelper.FullName</h3>
-                <p>@UserHelper.EmailAddress</p>
             </div>
         </div>
 
         <div class="admin-container x3">
             <a href="@Url.Action("EditAvatar", "Manage", new { area = "Profile" })" class="admin-item launch-modal" data-title="Change Avatar"><span class="fa fa-picture-o"></span>Avatar</a>
-            <a href="@Url.Action("EditAccount", "Manage", new { area = "Profile", userId = UserHelper.UserId })" class="admin-item launch-modal" data-title="Edit Details"><span class="fa fa-pencil"></span>Details</a>
-            <a href="@Url.Action("Roles", "UserManager", new { area = "Admin", userId = UserHelper.UserId })" class="admin-item launch-modal" data-title="Edit Roles"><span class="fa fa-building"></span>Roles</a>
+            <a href="@Url.Action("EditAccount", "Manage", new { area = "Profile", userId = UserHelper.Id })" class="admin-item launch-modal" data-title="Edit Details"><span class="fa fa-pencil"></span>Details</a>
+            <a href="@Url.Action("Roles", "UserManager", new { area = "Admin", userId = UserHelper.Id })" class="admin-item launch-modal" data-title="Edit Roles"><span class="fa fa-building"></span>Roles</a>
         </div>
     </div>
 </div>
\ No newline at end of file
diff --git a/Portal.CMS.Web/Areas/Admin/Views/Dashboard/_Welcome.cshtml b/PortalCMS.Web/Areas/Admin/Views/Dashboard/_Welcome.cshtml
similarity index 53%
rename from Portal.CMS.Web/Areas/Admin/Views/Dashboard/_Welcome.cshtml
rename to PortalCMS.Web/Areas/Admin/Views/Dashboard/_Welcome.cshtml
index eae619a..a78a79b 100644
--- a/Portal.CMS.Web/Areas/Admin/Views/Dashboard/_Welcome.cshtml
+++ b/PortalCMS.Web/Areas/Admin/Views/Dashboard/_Welcome.cshtml
@@ -5,9 +5,8 @@
         <p>Portal CMS is a fully featured and responsive content management system with integrated page builder.</p>
         <p>Start building your website by adding Media, Posts and Pages!</p>
 
-        <div class="admin-container x2">
-            <a href="http://portalcms.online" class="admin-item" data-title="View Repository"><span class="fa fa-info"></span>Learn More</a>
-            <a href="https://github.com/tommcclean/PortalCMS" class="admin-item" data-title="View Repository"><span class="fa fa-code-fork"></span>Repository</a>
+        <div class="admin-container x1">
+            <a href="https://github.com/sohailqureshi/PortalCMS" class="admin-item" data-title="View Repository" target="_blank"><span class="fa fa-code-fork"></span>Repository</a>
         </div>
     </div>
 </div>
\ No newline at end of file
diff --git a/Portal.CMS.Web/Areas/Admin/Views/MediaManager/Index.cshtml b/PortalCMS.Web/Areas/Admin/Views/MediaManager/Index.cshtml
similarity index 98%
rename from Portal.CMS.Web/Areas/Admin/Views/MediaManager/Index.cshtml
rename to PortalCMS.Web/Areas/Admin/Views/MediaManager/Index.cshtml
index ac254f8..6ecf75d 100644
--- a/Portal.CMS.Web/Areas/Admin/Views/MediaManager/Index.cshtml
+++ b/PortalCMS.Web/Areas/Admin/Views/MediaManager/Index.cshtml
@@ -1,4 +1,4 @@
-@model Portal.CMS.Web.Areas.Admin.ViewModels.MediaManager.MediaViewModel
+@model PortalCMS.Web.Areas.Admin.ViewModels.MediaManager.MediaViewModel
 @{
     ViewBag.Title = "Media Manager";
     ViewBag.Icon = "/Areas/Admin/Content/Images/icon-media.png";
diff --git a/Portal.CMS.Web/Areas/Admin/Views/MediaManager/_UploadFont.cshtml b/PortalCMS.Web/Areas/Admin/Views/MediaManager/_UploadFont.cshtml
similarity index 92%
rename from Portal.CMS.Web/Areas/Admin/Views/MediaManager/_UploadFont.cshtml
rename to PortalCMS.Web/Areas/Admin/Views/MediaManager/_UploadFont.cshtml
index 16662cb..35d0167 100644
--- a/Portal.CMS.Web/Areas/Admin/Views/MediaManager/_UploadFont.cshtml
+++ b/PortalCMS.Web/Areas/Admin/Views/MediaManager/_UploadFont.cshtml
@@ -1,4 +1,4 @@
-@model Portal.CMS.Web.Areas.Admin.ViewModels.MediaManager.UploadFontViewModel
+@model PortalCMS.Web.Areas.Admin.ViewModels.MediaManager.UploadFontViewModel
 @{
     ViewBag.Title = "Upload Font";
     Layout = "";
diff --git a/Portal.CMS.Web/Areas/Admin/Views/MediaManager/_UploadImage.cshtml b/PortalCMS.Web/Areas/Admin/Views/MediaManager/_UploadImage.cshtml
similarity index 91%
rename from Portal.CMS.Web/Areas/Admin/Views/MediaManager/_UploadImage.cshtml
rename to PortalCMS.Web/Areas/Admin/Views/MediaManager/_UploadImage.cshtml
index cda74c5..734bfd9 100644
--- a/Portal.CMS.Web/Areas/Admin/Views/MediaManager/_UploadImage.cshtml
+++ b/PortalCMS.Web/Areas/Admin/Views/MediaManager/_UploadImage.cshtml
@@ -1,4 +1,4 @@
-@model Portal.CMS.Web.Areas.Admin.ViewModels.MediaManager.UploadImageViewModel
+@model PortalCMS.Web.Areas.Admin.ViewModels.MediaManager.UploadImageViewModel
 @{
     ViewBag.Title = "Upload Image";
     ViewBag.Icon = "/Areas/Admin/Content/Images/icon-media.png";
diff --git a/Portal.CMS.Web/Areas/Admin/Views/MenuItem/Edit.cshtml b/PortalCMS.Web/Areas/Admin/Views/MenuItem/Edit.cshtml
similarity index 89%
rename from Portal.CMS.Web/Areas/Admin/Views/MenuItem/Edit.cshtml
rename to PortalCMS.Web/Areas/Admin/Views/MenuItem/Edit.cshtml
index a043df6..7bad9eb 100644
--- a/Portal.CMS.Web/Areas/Admin/Views/MenuItem/Edit.cshtml
+++ b/PortalCMS.Web/Areas/Admin/Views/MenuItem/Edit.cshtml
@@ -1,4 +1,4 @@
-@model Portal.CMS.Web.Areas.Admin.ViewModels.MenuItem.EditViewModel
+@model PortalCMS.Web.Areas.Admin.ViewModels.MenuItem.EditViewModel
 @{
     Layout = "";
 }
@@ -43,7 +43,7 @@
     <div class="alert alert-warning" role="alert">A user must have at least one selected role to see this link. Show to all by choosing no roles.</div>
         <div class="control-group control-textarea float-container">
             @Html.LabelFor(x => x.SelectedRoleList)
-            @Html.ListBoxFor(m => m.SelectedRoleList, Model.RoleList.Select(r => new SelectListItem { Text = r.RoleName, Value = r.RoleName.ToString(), Selected = Model.SelectedRoleList != null && Model.SelectedRoleList.Contains(r.RoleName) }))
+            @Html.ListBoxFor(m => m.SelectedRoleList, Model.RoleList.Select(r => new SelectListItem { Text = r.Name, Value = r.Name.ToString(), Selected = Model.SelectedRoleList != null && Model.SelectedRoleList.Contains(r.Name) }))
         </div>
 
         <div class="footer">
diff --git a/Portal.CMS.Web/Areas/Admin/Views/MenuItem/_Create.cshtml b/PortalCMS.Web/Areas/Admin/Views/MenuItem/_Create.cshtml
similarity index 95%
rename from Portal.CMS.Web/Areas/Admin/Views/MenuItem/_Create.cshtml
rename to PortalCMS.Web/Areas/Admin/Views/MenuItem/_Create.cshtml
index 84e4db0..3923b20 100644
--- a/Portal.CMS.Web/Areas/Admin/Views/MenuItem/_Create.cshtml
+++ b/PortalCMS.Web/Areas/Admin/Views/MenuItem/_Create.cshtml
@@ -1,4 +1,4 @@
-@model Portal.CMS.Web.Areas.Admin.ViewModels.MenuItem.CreateViewModel
+@model PortalCMS.Web.Areas.Admin.ViewModels.MenuItem.CreateViewModel
 @{
     Layout = "";
     var menuList = Model.MenuList.Select(x => new SelectListItem { Value = x.MenuId.ToString(), Text = x.MenuName });
@@ -131,7 +131,7 @@
                 <div class="alert alert-warning" role="alert">A user must have at least one selected role to see this link. Show to all by choosing no roles.</div>
                 <div class="control-group control-textarea float-container">
                     @Html.LabelFor(x => x.SelectedRoleList)
-                    @Html.ListBoxFor(m => m.SelectedRoleList, Model.RoleList.Select(r => new SelectListItem { Text = r.RoleName, Value = r.RoleName.ToString(), Selected = Model.SelectedRoleList != null && Model.SelectedRoleList.Contains(r.RoleName) }))
+                    @Html.ListBoxFor(m => m.SelectedRoleList, Model.RoleList.Select(r => new SelectListItem { Text = r.Name, Value = r.Name.ToString(), Selected = Model.SelectedRoleList != null && Model.SelectedRoleList.Contains(r.Name) }))
                 </div>
             </div>
 
@@ -152,7 +152,7 @@
                                 target = string.Format("/{0}/{1}", page.PageController, page.PageAction);
                             }
 
-                            <div class="list list-simple" data-link-target="@target" data-link-title="@page.PageName" data-link-roles="@string.Join(",", page.PageRoles.Select(x => x.Role.RoleName))">
+                            <div class="list list-simple" data-link-target="@target" data-link-title="@page.PageName" data-link-roles="@string.Join(",", page.PageRoles.Select(x => x.Role.Name))">
                                 <h4>@page.PageName</h4>
                                 <p>@target</p>
                                 <div class="list-action"><span class="fa fa-globe"></span></div>
@@ -169,7 +169,7 @@
                         @foreach (var post in Model.PostList)
                         {
                             var target = string.Format("/Blog/Read/Index/postId={0}", post.PostId);
-                            <div class="list list-simple" data-link-target="@target" data-link-title="@post.PostTitle" data-link-roles="@string.Join(",", post.PostRoles.Select(x => x.Role.RoleName))">
+                            <div class="list list-simple" data-link-target="@target" data-link-title="@post.PostTitle" data-link-roles="@string.Join(",", post.PostRoles.Select(x => x.Role.Name))">
                                 <h4>@post.PostTitle</h4>
                                 <p>@target</p>
                                 <div class="list-action"><span class="fa fa-book"></span></div>
diff --git a/Portal.CMS.Web/Areas/Admin/Views/PageManager/Index.cshtml b/PortalCMS.Web/Areas/Admin/Views/PageManager/Index.cshtml
similarity index 98%
rename from Portal.CMS.Web/Areas/Admin/Views/PageManager/Index.cshtml
rename to PortalCMS.Web/Areas/Admin/Views/PageManager/Index.cshtml
index 1c81998..13c5972 100644
--- a/Portal.CMS.Web/Areas/Admin/Views/PageManager/Index.cshtml
+++ b/PortalCMS.Web/Areas/Admin/Views/PageManager/Index.cshtml
@@ -1,4 +1,4 @@
-@model Portal.CMS.Web.Areas.Admin.ViewModels.PageManager.PagesViewModel
+@model PortalCMS.Web.Areas.Admin.ViewModels.PageManager.PagesViewModel
 @{
     ViewBag.Title = "Page Manager";
     ViewBag.Icon = "/Areas/Admin/Content/Images/icon-pages.png";
diff --git a/Portal.CMS.Web/Areas/Admin/Views/PageManager/_AppDrawer.cshtml b/PortalCMS.Web/Areas/Admin/Views/PageManager/_AppDrawer.cshtml
similarity index 95%
rename from Portal.CMS.Web/Areas/Admin/Views/PageManager/_AppDrawer.cshtml
rename to PortalCMS.Web/Areas/Admin/Views/PageManager/_AppDrawer.cshtml
index cbce010..af9bd33 100644
--- a/Portal.CMS.Web/Areas/Admin/Views/PageManager/_AppDrawer.cshtml
+++ b/PortalCMS.Web/Areas/Admin/Views/PageManager/_AppDrawer.cshtml
@@ -1,4 +1,4 @@
-@model Portal.CMS.Web.Areas.Admin.ViewModels.PageManager.AppDrawerViewModel
+@model PortalCMS.Web.Areas.Admin.ViewModels.PageManager.AppDrawerViewModel
 @{
     Layout = "";
 }
diff --git a/Portal.CMS.Web/Areas/Admin/Views/PageManager/_Create.cshtml b/PortalCMS.Web/Areas/Admin/Views/PageManager/_Create.cshtml
similarity index 85%
rename from Portal.CMS.Web/Areas/Admin/Views/PageManager/_Create.cshtml
rename to PortalCMS.Web/Areas/Admin/Views/PageManager/_Create.cshtml
index 4dbff13..319cff5 100644
--- a/Portal.CMS.Web/Areas/Admin/Views/PageManager/_Create.cshtml
+++ b/PortalCMS.Web/Areas/Admin/Views/PageManager/_Create.cshtml
@@ -1,4 +1,4 @@
-@model Portal.CMS.Web.Areas.Admin.ViewModels.PageManager.CreateViewModel
+@model PortalCMS.Web.Areas.Admin.ViewModels.PageManager.CreateViewModel
 @{
     Layout = "";
 }
@@ -35,7 +35,7 @@
     <div class="alert alert-warning" role="alert">A user must have at least one of the roles selected below to see this Page. To show the Page to all users select no roles.</div>
     <div class="control-group control-textarea float-container">
         @Html.LabelFor(x => x.SelectedRoleList)
-        @Html.ListBoxFor(m => m.SelectedRoleList, Model.RoleList.Select(r => new SelectListItem { Text = r.RoleName, Value = r.RoleName.ToString(), Selected = Model.SelectedRoleList != null && Model.SelectedRoleList.Contains(r.RoleName) }))
+        @Html.ListBoxFor(m => m.SelectedRoleList, Model.RoleList.Select(r => new SelectListItem { Text = r.Name, Value = r.Name.ToString(), Selected = Model.SelectedRoleList != null && Model.SelectedRoleList.Contains(r.Name) }))
     </div>
 
     <br />
diff --git a/Portal.CMS.Web/Areas/Admin/Views/PageManager/_Edit.cshtml b/PortalCMS.Web/Areas/Admin/Views/PageManager/_Edit.cshtml
similarity index 85%
rename from Portal.CMS.Web/Areas/Admin/Views/PageManager/_Edit.cshtml
rename to PortalCMS.Web/Areas/Admin/Views/PageManager/_Edit.cshtml
index 786e7e8..6a5309d 100644
--- a/Portal.CMS.Web/Areas/Admin/Views/PageManager/_Edit.cshtml
+++ b/PortalCMS.Web/Areas/Admin/Views/PageManager/_Edit.cshtml
@@ -1,4 +1,4 @@
-@model Portal.CMS.Web.Areas.Admin.ViewModels.PageManager.EditViewModel
+@model PortalCMS.Web.Areas.Admin.ViewModels.PageManager.EditViewModel
 @{
     Layout = "";
 }
@@ -37,7 +37,7 @@
     <div class="alert alert-warning" role="alert">A user must have at least one of the roles selected below to see this Page. To show the Page to all users select no roles.</div>
     <div class="control-group control-textarea float-container">
         @Html.LabelFor(x => x.SelectedRoleList)
-        @Html.ListBoxFor(m => m.SelectedRoleList, Model.RoleList.Select(r => new SelectListItem { Text = r.RoleName, Value = r.RoleName.ToString(), Selected = Model.SelectedRoleList != null && Model.SelectedRoleList.Contains(r.RoleName) }))
+        @Html.ListBoxFor(m => m.SelectedRoleList, Model.RoleList.Select(r => new SelectListItem { Text = r.Name, Value = r.Name.ToString(), Selected = Model.SelectedRoleList != null && Model.SelectedRoleList.Contains(r.Name) }))
     </div>
 
     <br />
diff --git a/Portal.CMS.Web/Areas/Admin/Views/PostCategories/_Add.cshtml b/PortalCMS.Web/Areas/Admin/Views/PostCategories/_Add.cshtml
similarity index 87%
rename from Portal.CMS.Web/Areas/Admin/Views/PostCategories/_Add.cshtml
rename to PortalCMS.Web/Areas/Admin/Views/PostCategories/_Add.cshtml
index 4b2b67c..86f0eba 100644
--- a/Portal.CMS.Web/Areas/Admin/Views/PostCategories/_Add.cshtml
+++ b/PortalCMS.Web/Areas/Admin/Views/PostCategories/_Add.cshtml
@@ -1,4 +1,4 @@
-@model Portal.CMS.Web.Areas.Admin.ViewModels.PostCategories.AddViewModel
+@model PortalCMS.Web.Areas.Admin.ViewModels.PostCategories.AddViewModel
 @{
     Layout = "";
 }
diff --git a/Portal.CMS.Web/Areas/Admin/Views/PostCategories/_Edit.cshtml b/PortalCMS.Web/Areas/Admin/Views/PostCategories/_Edit.cshtml
similarity index 87%
rename from Portal.CMS.Web/Areas/Admin/Views/PostCategories/_Edit.cshtml
rename to PortalCMS.Web/Areas/Admin/Views/PostCategories/_Edit.cshtml
index e167671..c145bab 100644
--- a/Portal.CMS.Web/Areas/Admin/Views/PostCategories/_Edit.cshtml
+++ b/PortalCMS.Web/Areas/Admin/Views/PostCategories/_Edit.cshtml
@@ -1,4 +1,4 @@
-@model Portal.CMS.Web.Areas.Admin.ViewModels.PostCategories.EditViewModel
+@model PortalCMS.Web.Areas.Admin.ViewModels.PostCategories.EditViewModel
 @{
     Layout = "";
 }
diff --git a/Portal.CMS.Web/Areas/Admin/Views/QuickAccess/_Render.cshtml b/PortalCMS.Web/Areas/Admin/Views/QuickAccess/_Render.cshtml
similarity index 94%
rename from Portal.CMS.Web/Areas/Admin/Views/QuickAccess/_Render.cshtml
rename to PortalCMS.Web/Areas/Admin/Views/QuickAccess/_Render.cshtml
index 3f5f037..2f89e14 100644
--- a/Portal.CMS.Web/Areas/Admin/Views/QuickAccess/_Render.cshtml
+++ b/PortalCMS.Web/Areas/Admin/Views/QuickAccess/_Render.cshtml
@@ -1,4 +1,4 @@
-@model Portal.CMS.Web.Areas.Admin.ViewModels.Dashboard.QuickAccessViewModel
+@model PortalCMS.Web.Areas.Admin.ViewModels.Dashboard.QuickAccessViewModel
 
 <div class="page-admin-wrapper admin-wrapper animated zoomInUp">
     @foreach (var category in Model.Categories)
diff --git a/Portal.CMS.Web/Areas/Admin/Views/RoleManager/_Create.cshtml b/PortalCMS.Web/Areas/Admin/Views/RoleManager/_Create.cshtml
similarity index 86%
rename from Portal.CMS.Web/Areas/Admin/Views/RoleManager/_Create.cshtml
rename to PortalCMS.Web/Areas/Admin/Views/RoleManager/_Create.cshtml
index 1ebf24d..6cf7f26 100644
--- a/Portal.CMS.Web/Areas/Admin/Views/RoleManager/_Create.cshtml
+++ b/PortalCMS.Web/Areas/Admin/Views/RoleManager/_Create.cshtml
@@ -1,4 +1,4 @@
-@model Portal.CMS.Web.Areas.Admin.ViewModels.RoleManager.CreateViewModel
+@model PortalCMS.Web.Areas.Admin.ViewModels.RoleManager.CreateViewModel
 @{
     Layout = "";
 }
diff --git a/Portal.CMS.Web/Areas/Admin/Views/RoleManager/_Edit.cshtml b/PortalCMS.Web/Areas/Admin/Views/RoleManager/_Edit.cshtml
similarity index 92%
rename from Portal.CMS.Web/Areas/Admin/Views/RoleManager/_Edit.cshtml
rename to PortalCMS.Web/Areas/Admin/Views/RoleManager/_Edit.cshtml
index f4562fa..3809bf7 100644
--- a/Portal.CMS.Web/Areas/Admin/Views/RoleManager/_Edit.cshtml
+++ b/PortalCMS.Web/Areas/Admin/Views/RoleManager/_Edit.cshtml
@@ -1,4 +1,4 @@
-@model Portal.CMS.Web.Areas.Admin.ViewModels.RoleManager.EditViewModel
+@model PortalCMS.Web.Areas.Admin.ViewModels.RoleManager.EditViewModel
 @{
     Layout = "";
 }
diff --git a/PortalCMS.Web/Areas/Admin/Views/SettingManager/_Setup.cshtml b/PortalCMS.Web/Areas/Admin/Views/SettingManager/_Setup.cshtml
new file mode 100644
index 0000000..67670e9
--- /dev/null
+++ b/PortalCMS.Web/Areas/Admin/Views/SettingManager/_Setup.cshtml
@@ -0,0 +1,119 @@
+@model PortalCMS.Web.Areas.Admin.ViewModels.SettingManager.SetupViewModel
+@{
+	Layout = "";
+}
+
+<style>
+	.control-group label {
+		width: 190px;
+	}
+
+	.control-group input {
+		width: calc(100% - 190px);
+	}
+</style>
+
+@using (Html.BeginForm("Setup", "SettingManager", FormMethod.Post))
+{
+	@Html.AntiForgeryToken()
+
+	<ul class="nav nav-tabs">
+		<li role="presentation" class="active"><a href="#tab-general" aria-controls="tab-general" role="tab" data-toggle="tab">General</a></li>
+		<li role="presentation" class=""><a href="#tab-email" aria-controls="tab-email" role="tab" data-toggle="tab">Email</a></li>
+		<li role="presentation" class=""><a href="#tab-recaptcha" aria-controls="tab-recaptcha" role="tab" data-toggle="tab">Recaptcha</a></li>
+		<li role="presentation" class=""><a href="#tab-analytics" aria-controls="tab-analytics" role="tab" data-toggle="tab">Analytics</a></li>
+		<li role="presentation" class=""><a href="#tab-cdn" aria-controls="tab-cdn" role="tab" data-toggle="tab">CDN</a></li>
+	</ul>
+
+	<div class="tab-content">
+		<div role="tabpanel" class="tab-pane active" id="tab-general">
+			<h4>Welcome to Portal CMS</h4>
+			<p>There are a few small details you may wish to configure now to get your site setup.</p>
+
+			<br />
+			<div class="alert alert-warning" role="alert">The information on this tab is displayed in search results.</div>
+
+			@Html.ValidationMessage("WebsiteName")
+			<div class="control-group">
+				@Html.LabelFor(x => x.WebsiteName)
+				@Html.TextBoxFor(x => x.WebsiteName)
+			</div>
+
+			<div class="control-group">
+				@Html.LabelFor(x => x.AttachedLogo)
+				<input type="file" name="AttachedLogoImage" />
+			</div>
+
+			<div class="control-group">
+				@Html.LabelFor(x => x.AttachedIcon)
+				<input type="file" name="AttachedIconImage" />
+			</div>
+
+			<div class="control-group float-container">
+				@Html.LabelFor(x => x.WebsiteDescription)
+				@Html.TextBoxFor(x => x.WebsiteDescription)
+			</div>
+		</div>
+
+		<div role="tabpanel" class="tab-pane" id="tab-email">
+			<h4>SendGrid Email Delivery</h4>
+			<p>SendGrid is a reliable and easy to use method of email delivery, You can send 12,000 emails for free every month. <a href="https://sendgrid.com/" target="_blank">Learn More about SendGrid.</a></p>
+			<br />
+			<div class="alert alert-warning" role="alert">When you configure email settings, users can request a forgotten password email token.</div>
+			<div class="control-group">
+				@Html.LabelFor(x => x.EmailFromAddress)
+				@Html.TextBoxFor(x => x.EmailFromAddress)
+			</div>
+			<div class="control-group">
+				@Html.LabelFor(x => x.SendGridApiKey)
+				@Html.TextBoxFor(x => x.SendGridApiKey)
+			</div>
+		</div>
+
+		<div role="tabpanel" class="tab-pane" id="tab-recaptcha">
+			<h4>Recaptcha Integration</h4>
+			<p>ReCAPTCHA is a free Google service that protects your website from spam and abuse by using Application Programming Interface(API) key pairs</p>
+			<br />
+			<div class="alert alert-warning" role="alert">
+				<p>Click <a href="https://www.google.com/recaptcha/admin/create">here</a> to create a Recaptcha V2 api key pair.</p>
+				<img src="~/areas/admin/content/images/recaptcha.png" style="height: 400px; width:100%; text-align: center;" />
+			</div>
+
+			<div class="control-group">
+				@Html.LabelFor(x => x.RecaptchaSiteKey)
+				@Html.TextBoxFor(x => x.RecaptchaSiteKey)
+			</div>
+			<div class="control-group">
+				@Html.LabelFor(x => x.RecaptchaSecretKey)
+				@Html.TextBoxFor(x => x.RecaptchaSecretKey)
+			</div>
+		</div>
+
+		<div role="tabpanel" class="tab-pane" id="tab-analytics">
+			<h4>Google Analytics Integration</h4>
+			<p>Portal CMS collects its own Analytics to give you real time and useful information about how your website is being used. You can also configure Portal CMS to use Google Analytics.</p>
+			<br />
+			<div class="alert alert-warning" role="alert">When you submit your Google Analytics Tracking Code, we will start pushing data to your Analytics account.</div>
+			<div class="control-group">
+				@Html.LabelFor(x => x.GoogleAnalyticsId)
+				@Html.TextBoxFor(x => x.GoogleAnalyticsId)
+			</div>
+		</div>
+
+		<div role="tabpanel" class="tab-pane" id="tab-cdn">
+			<h4>Content Delivery Network</h4>
+			<p>Portal CMS can utilise a Content Delivery Network that is setup to cache the content of your website. When configured Portal CMS will load your Uploaded Images from the CDN.</p>
+			<br />
+			<div class="alert alert-warning" role="alert">Please enter your CDN Address below. For example: http://cdn.portalcms.online</div>
+			<div class="control-group">
+				@Html.LabelFor(x => x.CDNAddress)
+				@Html.TextBoxFor(x => x.CDNAddress)
+			</div>
+		</div>
+	</div>
+
+	<div class="footer">
+		<button class="btn primary">Save</button>
+		<button class="btn" data-dismiss="modal">Cancel</button>
+	</div>
+}
diff --git a/Portal.CMS.Web/Areas/Admin/Views/Shared/_Layout.cshtml b/PortalCMS.Web/Areas/Admin/Views/Shared/_Layout.cshtml
similarity index 100%
rename from Portal.CMS.Web/Areas/Admin/Views/Shared/_Layout.cshtml
rename to PortalCMS.Web/Areas/Admin/Views/Shared/_Layout.cshtml
diff --git a/Portal.CMS.Web/Areas/Admin/Views/Shared/_Sidebar.cshtml b/PortalCMS.Web/Areas/Admin/Views/Shared/_Sidebar.cshtml
similarity index 100%
rename from Portal.CMS.Web/Areas/Admin/Views/Shared/_Sidebar.cshtml
rename to PortalCMS.Web/Areas/Admin/Views/Shared/_Sidebar.cshtml
diff --git a/Portal.CMS.Web/Areas/Admin/Views/ThemeManager/Index.cshtml b/PortalCMS.Web/Areas/Admin/Views/ThemeManager/Index.cshtml
similarity index 97%
rename from Portal.CMS.Web/Areas/Admin/Views/ThemeManager/Index.cshtml
rename to PortalCMS.Web/Areas/Admin/Views/ThemeManager/Index.cshtml
index 225dc70..4461511 100644
--- a/Portal.CMS.Web/Areas/Admin/Views/ThemeManager/Index.cshtml
+++ b/PortalCMS.Web/Areas/Admin/Views/ThemeManager/Index.cshtml
@@ -1,4 +1,4 @@
-@model Portal.CMS.Web.Areas.Admin.ViewModels.ThemeManager.ThemeViewModel
+@model PortalCMS.Web.Areas.Admin.ViewModels.ThemeManager.ThemeViewModel
 @{
     ViewBag.Title = "Theme Manager";
     ViewBag.Icon = "/Areas/Admin/Content/Images/icon-thememanager.png";
diff --git a/Portal.CMS.Web/Areas/Admin/Views/ThemeManager/_AppDrawer.cshtml b/PortalCMS.Web/Areas/Admin/Views/ThemeManager/_AppDrawer.cshtml
similarity index 98%
rename from Portal.CMS.Web/Areas/Admin/Views/ThemeManager/_AppDrawer.cshtml
rename to PortalCMS.Web/Areas/Admin/Views/ThemeManager/_AppDrawer.cshtml
index 6f9f18d..fe5fa68 100644
--- a/Portal.CMS.Web/Areas/Admin/Views/ThemeManager/_AppDrawer.cshtml
+++ b/PortalCMS.Web/Areas/Admin/Views/ThemeManager/_AppDrawer.cshtml
@@ -1,4 +1,4 @@
-@model Portal.CMS.Web.Areas.Admin.ViewModels.ThemeManager.AppDrawerViewModel
+@model PortalCMS.Web.Areas.Admin.ViewModels.ThemeManager.AppDrawerViewModel
 @{
     Layout = "";
 }
diff --git a/Portal.CMS.Web/Areas/Admin/Views/ThemeManager/_Create.cshtml b/PortalCMS.Web/Areas/Admin/Views/ThemeManager/_Create.cshtml
similarity index 98%
rename from Portal.CMS.Web/Areas/Admin/Views/ThemeManager/_Create.cshtml
rename to PortalCMS.Web/Areas/Admin/Views/ThemeManager/_Create.cshtml
index 8f9a84d..9de5543 100644
--- a/Portal.CMS.Web/Areas/Admin/Views/ThemeManager/_Create.cshtml
+++ b/PortalCMS.Web/Areas/Admin/Views/ThemeManager/_Create.cshtml
@@ -1,4 +1,4 @@
-@model Portal.CMS.Web.Areas.Admin.ViewModels.ThemeManager.UpsertViewModel
+@model PortalCMS.Web.Areas.Admin.ViewModels.ThemeManager.UpsertViewModel
 @{
     Layout = "";
 
diff --git a/Portal.CMS.Web/Areas/Admin/Views/ThemeManager/_Default.cshtml b/PortalCMS.Web/Areas/Admin/Views/ThemeManager/_Default.cshtml
similarity index 85%
rename from Portal.CMS.Web/Areas/Admin/Views/ThemeManager/_Default.cshtml
rename to PortalCMS.Web/Areas/Admin/Views/ThemeManager/_Default.cshtml
index c5717eb..7a6541a 100644
--- a/Portal.CMS.Web/Areas/Admin/Views/ThemeManager/_Default.cshtml
+++ b/PortalCMS.Web/Areas/Admin/Views/ThemeManager/_Default.cshtml
@@ -1,4 +1,4 @@
-@model Portal.CMS.Web.Areas.Admin.ViewModels.ThemeManager.DefaultViewModel
+@model PortalCMS.Web.Areas.Admin.ViewModels.ThemeManager.DefaultViewModel
 @{
     Layout = "";
 }
diff --git a/Portal.CMS.Web/Areas/Admin/Views/ThemeManager/_Edit.cshtml b/PortalCMS.Web/Areas/Admin/Views/ThemeManager/_Edit.cshtml
similarity index 98%
rename from Portal.CMS.Web/Areas/Admin/Views/ThemeManager/_Edit.cshtml
rename to PortalCMS.Web/Areas/Admin/Views/ThemeManager/_Edit.cshtml
index c4d588d..997da84 100644
--- a/Portal.CMS.Web/Areas/Admin/Views/ThemeManager/_Edit.cshtml
+++ b/PortalCMS.Web/Areas/Admin/Views/ThemeManager/_Edit.cshtml
@@ -1,4 +1,4 @@
-@model Portal.CMS.Web.Areas.Admin.ViewModels.ThemeManager.UpsertViewModel
+@model PortalCMS.Web.Areas.Admin.ViewModels.ThemeManager.UpsertViewModel
 @{
     Layout = "";
 
diff --git a/PortalCMS.Web/Areas/Admin/Views/UserManager/Index.cshtml b/PortalCMS.Web/Areas/Admin/Views/UserManager/Index.cshtml
new file mode 100644
index 0000000..5fdc01f
--- /dev/null
+++ b/PortalCMS.Web/Areas/Admin/Views/UserManager/Index.cshtml
@@ -0,0 +1,69 @@
+@model PortalCMS.Web.Areas.Admin.ViewModels.UserManager.UsersViewModel
+@{
+    ViewBag.Title = "User Manager";
+    ViewBag.Icon = "/Areas/Admin/Content/Images/icon-users.png";
+}
+
+@Html.Action("Render", "QuickAccess", new { area = "Admin", pageType = QuickAccessPageType.UserManagement_Admin })
+
+<div class="row">
+    @foreach (var user in Model.Users)
+    {
+        <div class="col-xs-12 col-md-6 col-lg-4">
+					<div class="box" style="height:260px;">
+						<div class="box-title" style="background-color:green;">
+
+							@if (user.EmailConfirmed)
+							{
+								<span style="color:white;" title="Email Verified">@user.Email</span>
+							}
+							else
+							{
+								<span style="color:white;" title="Email Unverified">@user.Email</span>
+							}
+
+						</div>
+						<div class="row" style="height:80px;margin-top:60px;">
+							<div class="col-xs-3 vertical-alignment">
+								<img class="avatar" alt="User Avatar" src="data:image/jpeg;base64,@Convert.ToBase64String(UserHelper.AvatarImage)" />
+							</div>
+							<div class="col-xs-9 vertical-alignment" style="text-align: left; padding-left: 60px;">
+								<p class="h3">@user.GivenName @user.FamilyName</p>
+
+								<p style="text-align:left;" class="h6">
+									Registered:<span style="float:right;">@string.Format("{0:dd-MMM-yyyy HH:mm}", @user.RegistrationDate)</span>
+								</p>
+
+								<p style="text-align:left;" class="h6">
+									Last Updated:<span style="float:right;">@string.Format("{0:dd-MMM-yyyy HH:mm}", @user.LastUpdatedDate)</span>
+								</p>
+
+								<p style="text-align:left;" class="h6">
+									Last Login:<span style="float:right;">@string.Format("{0:dd-MMM-yyyy HH:mm}", @user.LastLoginDate)</span>
+								</p>
+
+								<p style="text-align:left;" class="h6">
+									Last Logout:<span style="float:right;">@string.Format("{0:dd-MMM-yyyy HH:mm}", @user.LastLogoutDate)</span>
+								</p>
+							</div>
+						</div>
+
+						@if (user.Id == UserHelper.Id)
+						{
+							<div class="admin-container x2">
+								<a href="@Url.Action("Details", "UserManager", new { userId = @user.Id })" class="admin-item launch-modal" data-title="Edit Details"><span class="fa fa-pencil"></span>Details</a>
+								<a href="@Url.Action("Roles", "UserManager", new { userId = @user.Id })" class="admin-item launch-modal" data-title="Edit Roles"><span class="fa fa-building"></span>Roles</a>
+							</div>
+						}
+						else
+						{
+							<div class="admin-container x3">
+								<a href="@Url.Action("Details", "UserManager", new { userId = @user.Id })" class="admin-item launch-modal" data-title="Edit Details"><span class="fa fa-pencil"></span>Details</a>
+								<a href="@Url.Action("Roles", "UserManager", new { userId = @user.Id })" class="admin-item launch-modal" data-title="Edit Roles"><span class="fa fa-building"></span>Roles</a>
+								<a href="@Url.Action("Delete", "UserManager", new { userId = @user.Id })" class="admin-item" data-toggle="confirmation" data-placement="top" data-container="body"><span class="fa fa-trash"></span>Delete</a>
+							</div>
+						}
+					</div>
+        </div>
+    }
+</div>
\ No newline at end of file
diff --git a/Portal.CMS.Web/Areas/Admin/Views/UserManager/_Create.cshtml b/PortalCMS.Web/Areas/Admin/Views/UserManager/_Create.cshtml
similarity index 94%
rename from Portal.CMS.Web/Areas/Admin/Views/UserManager/_Create.cshtml
rename to PortalCMS.Web/Areas/Admin/Views/UserManager/_Create.cshtml
index 22f20d5..8233c9a 100644
--- a/Portal.CMS.Web/Areas/Admin/Views/UserManager/_Create.cshtml
+++ b/PortalCMS.Web/Areas/Admin/Views/UserManager/_Create.cshtml
@@ -1,4 +1,4 @@
-@model Portal.CMS.Web.Areas.Admin.ViewModels.UserManager.CreateViewModel
+@model PortalCMS.Web.Areas.Admin.ViewModels.UserManager.CreateViewModel
 @{
     Layout = "";
 }
diff --git a/Portal.CMS.Web/Areas/Admin/Views/UserManager/_Details.cshtml b/PortalCMS.Web/Areas/Admin/Views/UserManager/_Details.cshtml
similarity index 93%
rename from Portal.CMS.Web/Areas/Admin/Views/UserManager/_Details.cshtml
rename to PortalCMS.Web/Areas/Admin/Views/UserManager/_Details.cshtml
index 90f4b81..a929e9a 100644
--- a/Portal.CMS.Web/Areas/Admin/Views/UserManager/_Details.cshtml
+++ b/PortalCMS.Web/Areas/Admin/Views/UserManager/_Details.cshtml
@@ -1,4 +1,4 @@
-@model Portal.CMS.Web.Areas.Admin.ViewModels.UserManager.DetailsViewModel
+@model PortalCMS.Web.Areas.Admin.ViewModels.UserManager.DetailsViewModel
 @{
     Layout = "";
 }
diff --git a/Portal.CMS.Web/Areas/Admin/Views/UserManager/_Roles.cshtml b/PortalCMS.Web/Areas/Admin/Views/UserManager/_Roles.cshtml
similarity index 71%
rename from Portal.CMS.Web/Areas/Admin/Views/UserManager/_Roles.cshtml
rename to PortalCMS.Web/Areas/Admin/Views/UserManager/_Roles.cshtml
index 3808a58..8773272 100644
--- a/Portal.CMS.Web/Areas/Admin/Views/UserManager/_Roles.cshtml
+++ b/PortalCMS.Web/Areas/Admin/Views/UserManager/_Roles.cshtml
@@ -1,4 +1,4 @@
-@model Portal.CMS.Web.Areas.Admin.ViewModels.UserManager.RolesViewModel
+@model PortalCMS.Web.Areas.Admin.ViewModels.UserManager.RolesViewModel
 @{
     Layout = "";
 }
@@ -10,7 +10,7 @@
     <div class="alert alert-warning" role="alert">Giving a user additional roles will allow them to see more on Portal CMS.</div>
 
     @Html.HiddenFor(x => x.UserId)
-    @Html.ListBoxFor(m => m.SelectedRoleList, Model.RoleList.Select(r => new SelectListItem { Text = r.RoleName, Value = r.RoleName.ToString(), Selected = Model.SelectedRoleList != null && Model.SelectedRoleList.Contains(r.RoleName) }))
+    @Html.ListBoxFor(m => m.SelectedRoleList, Model.RoleList.Select(r => new SelectListItem { Text = r.Name, Value = r.Name.ToString(), Selected = Model.SelectedRoleList != null && Model.SelectedRoleList.Contains(r.Name) }))
 
     <div class="footer">
         <button class="btn primary"><span class="fa fa-check"></span><span class="hidden-xs">Save</span></button>
diff --git a/Portal.CMS.Web/Areas/Admin/Views/_ViewStart.cshtml b/PortalCMS.Web/Areas/Admin/Views/_ViewStart.cshtml
similarity index 100%
rename from Portal.CMS.Web/Areas/Admin/Views/_ViewStart.cshtml
rename to PortalCMS.Web/Areas/Admin/Views/_ViewStart.cshtml
diff --git a/Portal.CMS.Web/Areas/Authentication/Views/web.config b/PortalCMS.Web/Areas/Admin/Views/web.config
similarity index 81%
rename from Portal.CMS.Web/Areas/Authentication/Views/web.config
rename to PortalCMS.Web/Areas/Admin/Views/web.config
index adbdbb6..7c3ff4b 100644
--- a/Portal.CMS.Web/Areas/Authentication/Views/web.config
+++ b/PortalCMS.Web/Areas/Admin/Views/web.config
@@ -17,12 +17,12 @@
         <add namespace="System.Web.Mvc.Html" />
         <add namespace="System.Web.Routing" />
         <add namespace="System.Web.Optimization" />
-        <add namespace="Portal.CMS.Web" />
-        <add namespace="Portal.CMS.Web.Architecture.Helpers" />
-        <add namespace="Portal.CMS.Web.Architecture.Extensions" />
-        <add namespace="Portal.CMS.Web.Areas.Admin.ViewModels.Dashboard" />
-        <add namespace="Portal.CMS.Entities.Enumerators" />
-        <add namespace="Portal.CMS.Entities.Entities" />
+        <add namespace="PortalCMS.Web" />
+        <add namespace="PortalCMS.Web.Architecture.Helpers" />
+        <add namespace="PortalCMS.Web.Architecture.Extensions" />
+        <add namespace="PortalCMS.Web.Areas.Admin.ViewModels.Dashboard" />
+        <add namespace="PortalCMS.Entities.Enumerators" />
+        <add namespace="PortalCMS.Entities.Entities" />
       </namespaces>
     </pages>
   </system.web.webPages.razor>
diff --git a/Portal.CMS.Web/Areas/Authentication/AuthenticationAreaRegistration.cs b/PortalCMS.Web/Areas/Authentication/AuthenticationAreaRegistration.cs
similarity index 92%
rename from Portal.CMS.Web/Areas/Authentication/AuthenticationAreaRegistration.cs
rename to PortalCMS.Web/Areas/Authentication/AuthenticationAreaRegistration.cs
index 21fe45c..b3477b5 100644
--- a/Portal.CMS.Web/Areas/Authentication/AuthenticationAreaRegistration.cs
+++ b/PortalCMS.Web/Areas/Authentication/AuthenticationAreaRegistration.cs
@@ -1,6 +1,6 @@
 using System.Web.Mvc;
 
-namespace Portal.CMS.Web.Areas.Authentication
+namespace PortalCMS.Web.Areas.Authentication
 {
     public class AuthenticationAreaRegistration : AreaRegistration
     {
diff --git a/Portal.CMS.Web/Areas/Authentication/Content/Images/reset-background-image.jpg b/PortalCMS.Web/Areas/Authentication/Content/Images/reset-background-image.jpg
similarity index 100%
rename from Portal.CMS.Web/Areas/Authentication/Content/Images/reset-background-image.jpg
rename to PortalCMS.Web/Areas/Authentication/Content/Images/reset-background-image.jpg
diff --git a/PortalCMS.Web/Areas/Authentication/Controllers/LinkedInController.cs b/PortalCMS.Web/Areas/Authentication/Controllers/LinkedInController.cs
new file mode 100644
index 0000000..9b14e01
--- /dev/null
+++ b/PortalCMS.Web/Areas/Authentication/Controllers/LinkedInController.cs
@@ -0,0 +1,37 @@
+using Microsoft.Owin;
+using RestSharp;
+using System.Configuration;
+using System.Web.Mvc;
+
+namespace PortalCMS.Web.Areas.Authentication.Controllers
+{
+	public class LinkedInController : Controller
+	{
+		// GET: LinkedIn
+		public ActionResult Index(string code, string state)
+		{
+			string clientId = ConfigurationManager.AppSettings["Linkedin.ClientID"];
+			string clientSecret = ConfigurationManager.AppSettings["Linkedin.SecretKey"];
+
+			//This method path is your return URL  
+			try
+			{
+				//Get Accedd Token  
+				var client = new RestClient("https://www.linkedin.com/oauth/v2/accessToken");
+				var request = new RestRequest(Method.POST);
+				request.AddParameter("grant_type", "authorization_code");
+				request.AddParameter("code", code);
+				request.AddParameter("redirect_uri", new PathString("/Index"));
+				request.AddParameter("client_id", clientId);
+				request.AddParameter("client_secret", clientSecret);
+				IRestResponse response = client.Execute(request);
+				var content = response.Content;
+			}
+			catch 
+			{
+				throw;
+			}
+			return View();
+		}
+	}
+}
\ No newline at end of file
diff --git a/PortalCMS.Web/Areas/Authentication/Controllers/LoginController.cs b/PortalCMS.Web/Areas/Authentication/Controllers/LoginController.cs
new file mode 100644
index 0000000..6a00ebd
--- /dev/null
+++ b/PortalCMS.Web/Areas/Authentication/Controllers/LoginController.cs
@@ -0,0 +1,185 @@
+using Microsoft.AspNet.Identity;
+using Microsoft.AspNet.Identity.Owin;
+using Microsoft.Owin.Security;
+using PortalCMS.Services.Authentication;
+using PortalCMS.Web.Areas.Authentication.ViewModel.Login;
+using PortalCMS.Web.Areas.Authentication.ViewModels.Login;
+using PortalCMS.Web.Controllers.Base;
+using System;
+using System.Linq;
+using System.Threading.Tasks;
+using System.Web;
+using System.Web.Mvc;
+
+namespace PortalCMS.Web.Areas.Authentication.Controllers
+{
+	public class LoginController : SignInController
+	{
+		private readonly IUserService _userService;
+		private readonly IRoleService _roleService;
+
+		public LoginController(IUserService userService, IRoleService roleService)
+		{
+			_userService = userService;
+			_roleService = roleService;
+		}
+
+		[HttpGet]
+		[OutputCache(Duration = 86400)]
+		public ActionResult Index()
+		{
+			return View("_LoginForm", new LoginViewModel());
+		}
+
+		[HttpPost]
+		[ValidateAntiForgeryToken]
+		public async Task<ActionResult> Login(LoginViewModel model, string returnUrl="")
+		{
+			if (!ModelState.IsValid)
+			{
+				return View("_LoginForm", model);
+			}
+
+			var result = SignInStatus.Failure;
+			var user = UserManager.FindByEmail(model.EmailAddress);
+			if (user != null)
+			{
+				result = await SignInManager.PasswordSignInAsync(user.UserName, model.Password, model.RememberMe, shouldLockout: false);
+			}
+
+			switch (result)
+			{
+				case SignInStatus.Success:
+					user.LastLoginDate = DateTime.Now;
+					UserManager.Update(user);
+					return Content("Refresh");
+
+				case SignInStatus.LockedOut:
+					return View("_LockoutForm", model);
+
+				case SignInStatus.RequiresVerification:
+					return RedirectToAction("SendCode", new { ReturnUrl = returnUrl, model.RememberMe });
+
+				case SignInStatus.Failure:
+				default:
+					ModelState.AddModelError("InvalidCredentials", "Invalid Account Credentials");
+					return View("_LoginForm", model);
+			}
+		}
+
+		//
+		// GET: /Login/SendCode
+		[AllowAnonymous]
+		public async Task<ActionResult> SendCode(string returnUrl, bool rememberMe)
+		{
+			var userId = await SignInManager.GetVerifiedUserIdAsync();
+			if (userId == null)
+			{
+				return View("Refresh");
+			}
+			var userFactors = await UserManager.GetValidTwoFactorProvidersAsync(userId);
+			var factorOptions = userFactors.Select(purpose => new SelectListItem { Text = purpose, Value = purpose }).ToList();
+			return View("_SendCode", new SendCodeViewModel { Providers = factorOptions, ReturnUrl = returnUrl, RememberMe = rememberMe });
+		}
+
+		//
+		// POST: /Login/SendCode
+		[HttpPost]
+		[AllowAnonymous]
+		[ValidateAntiForgeryToken]
+		public async Task<ActionResult> SendCode(SendCodeViewModel model)
+		{
+			if (!ModelState.IsValid)
+			{
+				return View();
+			}
+
+			// Generate the token and send it
+			if (!await SignInManager.SendTwoFactorCodeAsync(model.SelectedProvider))
+			{
+				return View("Error");
+			}
+			return RedirectToAction("_VerifyCode", new { Provider = model.SelectedProvider, model.ReturnUrl, model.RememberMe });
+		}
+
+		//
+		// GET: /Account/VerifyCode
+		[AllowAnonymous]
+		public async Task<ActionResult> VerifyCode(string provider, string returnUrl, bool rememberMe)
+		{
+			// Require that the user has already logged in via username/password or external login
+			if (!await SignInManager.HasBeenVerifiedAsync())
+			{
+				return View("Error");
+			}
+			return View(new VerifyCodeViewModel { Provider = provider, ReturnUrl = returnUrl, RememberMe = rememberMe });
+		}
+
+		//
+		// POST: /Account/VerifyCode
+		[HttpPost]
+		[AllowAnonymous]
+		[ValidateAntiForgeryToken]
+		public async Task<ActionResult> VerifyCode(VerifyCodeViewModel model)
+		{
+			if (!ModelState.IsValid)
+			{
+				return View(model);
+			}
+
+			// The following code protects for brute force attacks against the two factor codes. 
+			// If a user enters incorrect codes for a specified amount of time then the user account 
+			// will be locked out for a specified amount of time. 
+			// You can configure the account lockout settings in IdentityConfig
+			var result = await SignInManager.TwoFactorSignInAsync(model.Provider, model.Code, isPersistent: model.RememberMe, rememberBrowser: model.RememberBrowser);
+			switch (result)
+			{
+				case SignInStatus.Success:
+					return RedirectToLocal(model.ReturnUrl);
+				case SignInStatus.LockedOut:
+					return View("Lockout");
+				case SignInStatus.Failure:
+				default:
+					ModelState.AddModelError("", "Invalid code.");
+					return View(model);
+			}
+		}
+
+		[HttpGet]
+		public ActionResult Logout()
+		{
+			if (User.Identity.IsAuthenticated == true)
+			{
+				var user = UserManager.FindById(User.Identity.GetUserId());
+				user.LastLogoutDate = DateTime.Now;
+				UserManager.Update(user);
+			}
+
+			AuthenticationManager.SignOut(DefaultAuthenticationTypes.ApplicationCookie);
+			Session.Abandon();
+
+			return RedirectToAction("Index", "Home", new { area = "" });
+		}
+
+		#region Private methods
+
+		private IAuthenticationManager AuthenticationManager
+		{
+			get
+			{
+				return HttpContext.GetOwinContext().Authentication;
+			}
+		}
+
+		private ActionResult RedirectToLocal(string returnUrl)
+		{
+			if (Url.IsLocalUrl(returnUrl))
+			{
+				return Redirect(returnUrl);
+			}
+			return RedirectToAction("Index", "Home");
+		}
+
+		#endregion
+	}
+}
\ No newline at end of file
diff --git a/PortalCMS.Web/Areas/Authentication/Controllers/PasswordRecoveryController.cs b/PortalCMS.Web/Areas/Authentication/Controllers/PasswordRecoveryController.cs
new file mode 100644
index 0000000..ee80481
--- /dev/null
+++ b/PortalCMS.Web/Areas/Authentication/Controllers/PasswordRecoveryController.cs
@@ -0,0 +1,74 @@
+using PortalCMS.Entities.Enumerators;
+using PortalCMS.Services.Authentication;
+using PortalCMS.Web.Architecture.Helpers;
+using PortalCMS.Web.Areas.Authentication.ViewModels.Login;
+using PortalCMS.Web.Areas.Authentication.ViewModels.PasswordRecovery;
+using PortalCMS.Web.Controllers.Base;
+using System;
+using System.Threading.Tasks;
+using System.Web.Mvc;
+
+namespace PortalCMS.Web.Areas.Authentication.Controllers
+{
+	public class PasswordRecoveryController : BaseController
+	{
+		[HttpGet]
+		[OutputCache(Duration = 86400)]
+		public ActionResult Index()
+		{
+			return View("_RecoveryForm", new LoginViewModel());
+		}
+
+		[HttpPost]
+		[ValidateAntiForgeryToken]
+		public async Task<ActionResult> Forgot(LoginViewModel model)
+		{
+			var user = await UserManager.FindByEmailAsync(model.EmailAddress);
+			if (user == null || !(await UserManager.IsEmailConfirmedAsync(user.Id)))
+			{
+				// Don't reveal that the user does not exist or is not confirmed
+				return Content("Refresh");
+			}
+
+			// Send email if enabled
+			if (EmailHelper.IsEmailEnabled)
+			{
+				// For more information on how to enable account confirmation and password reset please visit https://go.microsoft.com/fwlink/?LinkID=320771
+				// Send an email with this link
+				string token = await UserManager.GeneratePasswordResetTokenAsync(user.Id);
+
+				// Create actionlink
+				var callbackUrl = Url.Action("Reset", "PasswordRecovery", new { area = "Authentication", userId = user.Id, token }, protocol: Request.Url.Scheme);
+
+				await EmailHelper.SendPasswordResetLinkAsync(user, token, callbackUrl);
+			}
+
+			return Content("Refresh");
+		}
+
+		[HttpGet]
+		public ActionResult Reset(string userId, string token)
+		{
+			return View(new ResetViewModel { UserId = userId, Token = token });
+		}
+
+		[HttpPost]
+		[ValidateAntiForgeryToken]
+		public async Task<ActionResult> Reset(ResetViewModel model)
+		{
+			if (!ModelState.IsValid)
+				return View(model);
+
+			var user = await UserManager.FindByIdAsync(model.UserId);
+			if (user == null)
+			{
+				// Don't reveal that the user does not exist
+				return RedirectToAction("Index", "Home", new { area = "" });
+			}
+
+			var result = await UserManager.ResetPasswordAsync(user.Id, model.Token, model.Password);
+
+			return RedirectToAction("Index", "Home", new { area = "" });
+		}
+	}
+}
\ No newline at end of file
diff --git a/PortalCMS.Web/Areas/Authentication/Controllers/RegistrationController.cs b/PortalCMS.Web/Areas/Authentication/Controllers/RegistrationController.cs
new file mode 100644
index 0000000..0779f75
--- /dev/null
+++ b/PortalCMS.Web/Areas/Authentication/Controllers/RegistrationController.cs
@@ -0,0 +1,149 @@
+using Microsoft.AspNet.Identity;
+using PortalCMS.Library.ExtensionMethods;
+using PortalCMS.Library.ReCaptcha;
+using PortalCMS.Services.Authentication;
+using PortalCMS.Web.Architecture.Helpers;
+using PortalCMS.Web.Areas.Authentication.ViewModels.Registration;
+using PortalCMS.Web.Controllers.Base;
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using System.Web.Mvc;
+
+namespace PortalCMS.Web.Areas.Authentication.Controllers
+{
+	public class RegistrationController : SignInController
+	{
+		private readonly IUserService _userService;
+		private readonly IRoleService _roleService;
+		private readonly IRegistrationService _registrationService;
+
+		public RegistrationController(IUserService userService, IRoleService roleService, IRegistrationService registrationService)
+		{
+			_userService = userService;
+			_roleService = roleService;
+			_registrationService = registrationService;
+		}
+
+		[HttpGet]
+		[OutputCache(Duration = 86400)]
+		public ActionResult Index()
+		{
+			var model = new RegisterViewModel();
+			if(string.IsNullOrEmpty(SettingHelper.Get("Recaptcha Site Key")))
+			{
+				return View("_RegistrationSimpleForm", model);
+			}
+
+			return View("_RegistrationForm", model);
+		}
+
+		[HttpPost]
+		[ValidateAntiForgeryToken]
+		public async Task<ActionResult> RegisterSimple(RegisterViewModel model)
+		{
+			if (ModelState.IsValid && string.IsNullOrEmpty(SettingHelper.Get("Recaptcha Site Key")))
+			{
+				return await ProcessRegistration("_RegistrationSimpleForm", model);
+			}
+
+			return View("_RegistrationSimpleForm", model);
+		}
+
+		[HttpPost]
+		[ValidateAntiForgeryToken]
+		public async Task<ActionResult> Register(RegisterViewModel model)
+		{
+			string captchaResponse = Request.Form["g-Recaptcha-Response"];
+			string secretKey = @SettingHelper.Get("Recaptcha Secret Key");
+
+			try
+			{
+				var result = ReCaptchaValidator.IsValidAsync(captchaResponse, secretKey);
+				if (result.Success && ModelState.IsValid && SettingHelper.Get("Recaptcha Site Key").HasValue())
+				{
+					return await ProcessRegistration("_RegistrationForm", model);
+				}
+
+				if (!result.Success)
+				{
+					foreach (string err in result.ErrorCodes)
+					{
+						ModelState.AddModelError("", err);
+					}
+				}
+			}
+			catch(Exception ex)
+			{
+				var msg = ex.Message;
+			}
+
+			return View("_RegistrationForm", model);
+		}
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="viewName"></param>
+		/// <param name="model"></param>
+		/// <returns></returns>
+		private async Task<ActionResult> ProcessRegistration(string viewName, RegisterViewModel model)
+		{
+			// First registration saved will be the administrator
+			var isAdministrator = (await _userService.CountAsync() < 1);
+			var userId = await _registrationService.RegisterAsync(model.EmailAddress, model.Password, model.GivenName, model.FamilyName, isAdministrator);
+
+			switch (string.IsNullOrEmpty(userId))
+			{
+				case true:
+					ModelState.AddModelError("RegistrationError", "Unable to complete registration - please try again!");
+					return View(viewName, model);
+
+				default:
+					if (isAdministrator)
+					{
+						await _roleService.UpdateAsync(userId, new List<string> { nameof(Admin), "Authenticated" });
+
+						var user = UserManager.FindByEmail(model.EmailAddress);
+						await SignInManager.PasswordSignInAsync(user.UserName, model.Password, true, shouldLockout: false);
+						return Content("Setup");
+					}
+					else
+					{
+						await _roleService.UpdateAsync(userId, new List<string> { "Authenticated" });
+
+						// Send email if enabled
+						if (EmailHelper.IsEmailEnabled)
+						{
+							var user = await UserManager.FindByEmailAsync(model.EmailAddress);
+
+							// For more information on how to enable account confirmation and password reset please visit https://go.microsoft.com/fwlink/?LinkID=320771
+							// Send an email with this link
+							string code = await UserManager.GenerateEmailConfirmationTokenAsync(user.Id);
+
+							// Create actionlink
+							var url = new UrlHelper(HttpContext.Request.RequestContext);
+							var callbackUrl = url.Action("ConfirmEmail", "Registration", new { area = "Authentication", userId = user.Id, code }, protocol: Request.Url.Scheme);
+
+							await EmailHelper.SendAccountActivationLinkAsync(user, code, callbackUrl);
+						}
+					}
+
+					return View("_Welcome");
+			}
+		}
+
+		//
+		// GET: /Account/ConfirmEmail
+		[AllowAnonymous]
+		public async Task<ActionResult> ConfirmEmail(string userId, string code)
+		{
+			if (userId == null || code == null)
+			{
+				return View("Error");
+			}
+			var result = await UserManager.ConfirmEmailAsync(userId, code);
+			return View(result.Succeeded ? "_EmailConfirmed" : "Error");
+		}
+	}
+}
\ No newline at end of file
diff --git a/PortalCMS.Web/Areas/Authentication/Controllers/SingleSignOnController.cs b/PortalCMS.Web/Areas/Authentication/Controllers/SingleSignOnController.cs
new file mode 100644
index 0000000..fe46ab0
--- /dev/null
+++ b/PortalCMS.Web/Areas/Authentication/Controllers/SingleSignOnController.cs
@@ -0,0 +1,34 @@
+using PortalCMS.Services.Authentication;
+using PortalCMS.Web.Architecture.Helpers;
+using System;
+using System.Threading.Tasks;
+using System.Web.Mvc;
+
+namespace PortalCMS.Web.Areas.Authentication.Controllers
+{
+	public class SingleSignOnController : Controller
+	{
+		private readonly IRoleService _roleService;
+		private readonly IUserService _userService;
+
+		public SingleSignOnController(IRoleService roleService, IUserService userService)
+		{
+			_roleService = roleService;
+			_userService = userService;
+		}
+
+		public async Task<ActionResult> Index()
+		{
+			var resetCookie = Request.Cookies["PortalCMS_SSO"];
+
+			if (!UserHelper.IsLoggedIn && resetCookie != null)
+			{
+				var cookieValues = resetCookie.Value.Split(',');
+				resetCookie.Expires = DateTime.Now.AddDays(-1);
+				Response.Cookies.Add(resetCookie);
+			}
+
+			return RedirectToAction("Index", "Home", new { area = "" });
+		}
+	}
+}
\ No newline at end of file
diff --git a/PortalCMS.Web/Areas/Authentication/ViewModel/Login/LoginViewModel.cs b/PortalCMS.Web/Areas/Authentication/ViewModel/Login/LoginViewModel.cs
new file mode 100644
index 0000000..2cea231
--- /dev/null
+++ b/PortalCMS.Web/Areas/Authentication/ViewModel/Login/LoginViewModel.cs
@@ -0,0 +1,19 @@
+using System.ComponentModel;
+using System.ComponentModel.DataAnnotations;
+
+namespace PortalCMS.Web.Areas.Authentication.ViewModels.Login
+{
+	public class LoginViewModel
+	{
+		[Required]
+		[DisplayName("Email")]
+		public string EmailAddress { get; set; }
+
+		[Required]
+		[DisplayName("Password")]
+		public string Password { get; set; }
+
+		[DisplayName("Remember Me")]
+		public bool RememberMe { get; set; }
+	}
+}
\ No newline at end of file
diff --git a/PortalCMS.Web/Areas/Authentication/ViewModel/Login/SendCodeViewModel.cs b/PortalCMS.Web/Areas/Authentication/ViewModel/Login/SendCodeViewModel.cs
new file mode 100644
index 0000000..4496222
--- /dev/null
+++ b/PortalCMS.Web/Areas/Authentication/ViewModel/Login/SendCodeViewModel.cs
@@ -0,0 +1,29 @@
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+
+namespace PortalCMS.Web.Areas.Authentication.ViewModel.Login
+{
+	public class SendCodeViewModel
+	{
+		public string SelectedProvider { get; set; }
+		public ICollection<System.Web.Mvc.SelectListItem> Providers { get; set; }
+		public string ReturnUrl { get; set; }
+		public bool RememberMe { get; set; }
+	}
+
+	public class VerifyCodeViewModel
+	{
+		[Required]
+		public string Provider { get; set; }
+
+		[Required]
+		[Display(Name = "Code")]
+		public string Code { get; set; }
+		public string ReturnUrl { get; set; }
+
+		[Display(Name = "Remember this browser?")]
+		public bool RememberBrowser { get; set; }
+
+		public bool RememberMe { get; set; }
+	}
+}
\ No newline at end of file
diff --git a/PortalCMS.Web/Areas/Authentication/ViewModel/PasswordRecovery/ResetViewModel.cs b/PortalCMS.Web/Areas/Authentication/ViewModel/PasswordRecovery/ResetViewModel.cs
new file mode 100644
index 0000000..b0ab397
--- /dev/null
+++ b/PortalCMS.Web/Areas/Authentication/ViewModel/PasswordRecovery/ResetViewModel.cs
@@ -0,0 +1,22 @@
+using System.ComponentModel;
+using System.ComponentModel.DataAnnotations;
+
+namespace PortalCMS.Web.Areas.Authentication.ViewModels.PasswordRecovery
+{
+	public class ResetViewModel
+	{
+		public string Token { get; set; }
+
+		[Required]
+		public string UserId { get; set; }
+
+		[Required]
+		[DisplayName("Password")]
+		public string Password { get; set; }
+
+		[Required]
+		[DisplayName("Confirm")]
+		[Compare("Password", ErrorMessage = "The password and confirmation password do not match.")]
+		public string ConfirmPassword { get; set; }
+	}
+}
\ No newline at end of file
diff --git a/PortalCMS.Web/Areas/Authentication/ViewModel/Registration/RegisterViewModel.cs b/PortalCMS.Web/Areas/Authentication/ViewModel/Registration/RegisterViewModel.cs
new file mode 100644
index 0000000..7a28a6b
--- /dev/null
+++ b/PortalCMS.Web/Areas/Authentication/ViewModel/Registration/RegisterViewModel.cs
@@ -0,0 +1,24 @@
+using PortalCMS.Library;
+using System.ComponentModel;
+using System.ComponentModel.DataAnnotations;
+
+namespace PortalCMS.Web.Areas.Authentication.ViewModels.Registration
+{
+	public class RegisterViewModel
+	{
+		[Required]
+		[DisplayName("Email")]
+		public string EmailAddress { get; set; }
+
+		[Required]
+		[DisplayName("Password")]
+		public string Password { get; set; }
+
+		[Required]
+		[DisplayName("First Name")]
+		public string GivenName { get; set; }
+
+		[DisplayName("Last Name")]
+		public string FamilyName { get; set; }
+	}
+}
\ No newline at end of file
diff --git a/PortalCMS.Web/Areas/Authentication/Views/Login/_LockoutForm.cshtml b/PortalCMS.Web/Areas/Authentication/Views/Login/_LockoutForm.cshtml
new file mode 100644
index 0000000..1381b42
--- /dev/null
+++ b/PortalCMS.Web/Areas/Authentication/Views/Login/_LockoutForm.cshtml
@@ -0,0 +1,13 @@
+@model PortalCMS.Web.Areas.Authentication.ViewModels.Login.LoginViewModel
+@{
+    Layout = "";
+}
+
+<ul class="nav nav-tabs">
+    <li role="presentation" class="active"><a href="#tab-lockout" aria-controls="tab-lockout" role="tab" data-toggle="tab"><span class="fa fa-lock"></span>Locked Out</a></li>
+</ul>
+<div class="tab-content">
+    <div role="tabpanel" class="tab-pane active" id="tab-lockout">
+			<div class="alert alert-warning" role="alert">Your account has been locked out - please contact admin support!</div>
+    </div>
+</div>
\ No newline at end of file
diff --git a/PortalCMS.Web/Areas/Authentication/Views/Login/_LoginForm.cshtml b/PortalCMS.Web/Areas/Authentication/Views/Login/_LoginForm.cshtml
new file mode 100644
index 0000000..bb2f063
--- /dev/null
+++ b/PortalCMS.Web/Areas/Authentication/Views/Login/_LoginForm.cshtml
@@ -0,0 +1,47 @@
+@model PortalCMS.Web.Areas.Authentication.ViewModels.Login.LoginViewModel
+@{
+    Layout = "";
+}
+<ul class="nav nav-tabs">
+    <li role="presentation" class="active"><a href="#tab-login" aria-controls="tab-login" role="tab" data-toggle="tab"><span class="fa fa-lock"></span>Login</a></li>
+</ul>
+<div class="tab-content">
+	<div role="tabpanel" class="tab-pane active" id="tab-login">
+		@Html.Action("Render", "CopyManager", new { area = "Admin", copyName = "Sign In Message" })
+
+		@using (Html.BeginForm("Login", "Login", FormMethod.Post, new { area = "Authentication" }))
+		{
+			@Html.AntiForgeryToken()
+
+			@Html.ValidationMessage("InvalidCredentials")
+
+			@Html.ValidationMessage("EmailAddress")
+			<div class="control-group">
+				@Html.LabelFor(x => x.EmailAddress)
+				@Html.TextBoxFor(x => x.EmailAddress, new { placeholder = "Email Address" })
+			</div>
+
+			@Html.ValidationMessage("Password")
+			<div class="control-group">
+				@Html.LabelFor(x => x.Password)
+				@Html.PasswordFor(x => x.Password, new { placeholder = "Password" })
+			</div>
+
+			<label class="control-checkbox-group">
+				@Html.CheckBoxFor(m => m.RememberMe)
+				@Html.LabelFor(x => x.RememberMe)
+				<span class="checkmark"></span>
+			</label>
+
+			<div class="button-group float-container">
+				<button class="btn primary"><span class="fa fa-check"></span><span class="hidden-xs">Sign In</span></button>
+				<button class="btn" data-dismiss="modal"><span class="fa fa-times"></span><span class="hidden-xs">Cancel</span></button>
+
+				@if (!string.IsNullOrWhiteSpace(SettingHelper.Get("SendGrid ApiKey")))
+				{
+					<a href="@Url.Action("Index","PasswordRecovery", new { area="Authentication"})" class="btn launch-modal" data-title="Recovery">Forgotten Password</a>
+				}
+			</div>
+		}
+	</div>
+</div>
\ No newline at end of file
diff --git a/PortalCMS.Web/Areas/Authentication/Views/Login/_SendCode.cshtml b/PortalCMS.Web/Areas/Authentication/Views/Login/_SendCode.cshtml
new file mode 100644
index 0000000..2c849b5
--- /dev/null
+++ b/PortalCMS.Web/Areas/Authentication/Views/Login/_SendCode.cshtml
@@ -0,0 +1,22 @@
+@model PortalCMS.Web.Areas.Authentication.ViewModel.Login.SendCodeViewModel
+@{
+	Layout = "";
+}
+
+@using (Html.BeginForm("SendCode", "Login", new { area = "Authentication", ReturnUrl = Model.ReturnUrl }, FormMethod.Post)) {
+    @Html.AntiForgeryToken()
+    @Html.Hidden("rememberMe", @Model.RememberMe)
+    <h4>Send verification code</h4>
+    <hr />
+		<div class="row">
+			<div class="col-md-8">
+				Select Two-Factor Authentication Provider:
+				@Html.DropDownListFor(model => model.SelectedProvider, Model.Providers)
+				<input type="submit" value="Submit" class="btn btn-default" />
+			</div>
+		</div>
+}
+
+@section Scripts {
+    @Scripts.Render("~/bundles/jqueryval")
+}
diff --git a/PortalCMS.Web/Areas/Authentication/Views/Login/_VerifyCode.cshtml b/PortalCMS.Web/Areas/Authentication/Views/Login/_VerifyCode.cshtml
new file mode 100644
index 0000000..09122b1
--- /dev/null
+++ b/PortalCMS.Web/Areas/Authentication/Views/Login/_VerifyCode.cshtml
@@ -0,0 +1,36 @@
+@model PortalCMS.Web.Areas.Authentication.ViewModel.Login.VerifyCodeViewModel
+@{
+	Layout = "";
+}
+
+@using (Html.BeginForm("VerifyCode", "Login", new { area="Authentication", ReturnUrl = Model.ReturnUrl }, FormMethod.Post)) {
+    @Html.AntiForgeryToken()
+    @Html.Hidden("provider", @Model.Provider)
+    @Html.Hidden("rememberMe", @Model.RememberMe)
+    <h4>Enter verification code</h4>
+    <hr />
+    @Html.ValidationSummary("", new { @class = "text-danger" })
+    <div class="form-group">
+        @Html.LabelFor(m => m.Code, new { @class = "col-md-2 control-label" })
+        <div class="col-md-10">
+            @Html.TextBoxFor(m => m.Code, new { @class = "form-control" })
+        </div>
+    </div>
+    <div class="form-group">
+        <div class="col-md-offset-2 col-md-10">
+            <div class="checkbox">
+                @Html.CheckBoxFor(m => m.RememberBrowser)
+                @Html.LabelFor(m => m.RememberBrowser)
+            </div>
+        </div>
+    </div>
+    <div class="form-group">
+        <div class="col-md-offset-2 col-md-10">
+            <input type="submit" class="btn btn-default" value="Submit" />
+        </div>
+    </div>
+}
+
+@section Scripts {
+    @Scripts.Render("~/bundles/jqueryval")
+}
diff --git a/PortalCMS.Web/Areas/Authentication/Views/PasswordRecovery/Reset.cshtml b/PortalCMS.Web/Areas/Authentication/Views/PasswordRecovery/Reset.cshtml
new file mode 100644
index 0000000..3d0534a
--- /dev/null
+++ b/PortalCMS.Web/Areas/Authentication/Views/PasswordRecovery/Reset.cshtml
@@ -0,0 +1,56 @@
+@model PortalCMS.Web.Areas.Authentication.ViewModels.PasswordRecovery.ResetViewModel
+@{
+    ViewBag.Title = "Reset Password";
+    Layout = "~/Views/Shared/_Layout.cshtml";
+}
+
+<style>
+    label
+    {
+        color: black;
+    }
+
+    input
+    {
+        color: black;
+    }
+</style>
+
+<section class="header background-parallax height-tall" style="background-image: url('/Areas/Authentication/Content/Images/reset-background-image.jpg');">
+    <div class="overlay overlay-medium"></div>
+    <div class="vertical-alignment component-container">
+        <h1>Reset Password</h1>
+        <br />
+
+				<div class="container dark">
+					@using (Html.BeginForm("Reset", "PasswordRecovery", FormMethod.Post, new { area = "Authentication" }))
+					{
+						@Html.AntiForgeryToken()
+						@Html.HiddenFor(x => x.Token)
+						@Html.HiddenFor(x => x.UserId)
+
+						<div class="col-xs-12 col-sm-push-2 col-sm-8">
+							@Html.ValidationMessage("Confirmation")
+							@Html.ValidationMessage("Execution")
+
+							@Html.ValidationMessage("Password")
+							<div class="control-group">
+								@Html.LabelFor(x => x.Password)
+								@Html.PasswordFor(x => x.Password, new { placeholder = "Password" })
+							</div>
+
+							@Html.ValidationMessage("ConfirmPassword")
+							<div class="control-group">
+								@Html.LabelFor(x => x.ConfirmPassword)
+								@Html.PasswordFor(x => x.ConfirmPassword, new { placeholder = "Confirm Password" })
+							</div>
+
+							<div class="button-group float-container">
+								<button class="btn primary">Reset Password</button>
+								<a href="~/" class="btn">Cancel</a>
+							</div>
+						</div>
+					}
+				</div>
+    </div>
+</section>
\ No newline at end of file
diff --git a/PortalCMS.Web/Areas/Authentication/Views/PasswordRecovery/_RecoveryForm.cshtml b/PortalCMS.Web/Areas/Authentication/Views/PasswordRecovery/_RecoveryForm.cshtml
new file mode 100644
index 0000000..85f2347
--- /dev/null
+++ b/PortalCMS.Web/Areas/Authentication/Views/PasswordRecovery/_RecoveryForm.cshtml
@@ -0,0 +1,29 @@
+@model PortalCMS.Web.Areas.Authentication.ViewModels.Login.LoginViewModel
+@{
+    Layout = "";
+}
+
+<ul class="nav nav-tabs">
+	<li role="presentation" class=""><a href="#tab-forgot" aria-controls="tab-forgot" role="tab" data-toggle="tab"><span class="fa fa-question"></span>Forgot Password?</a></li>
+</ul>
+<div class="tab-content">
+    <div role="tabpanel" class="tab-pane active" id="tab-forgot">
+        @using (Html.BeginForm("Forgot", "PasswordRecovery", new { area = "Authentication" }, FormMethod.Post))
+				{
+            @Html.AntiForgeryToken()
+
+            <div class="alert alert-warning" role="alert">We will send you a link by email that you can use to reset your password.</div>
+
+            @Html.ValidationMessage("EmailAddress")
+            <div class="control-group">
+                @Html.LabelFor(x => x.EmailAddress)
+                @Html.TextBoxFor(x => x.EmailAddress, new { placeholder = "Email Address" })
+            </div>
+
+            <div class="button-group float-container">
+                <button class="btn primary">Send Email</button>
+                <button class="btn" data-dismiss="modal">Cancel</button>
+            </div>
+				}
+    </div>
+</div>
\ No newline at end of file
diff --git a/PortalCMS.Web/Areas/Authentication/Views/Registration/_EmailConfirmed.cshtml b/PortalCMS.Web/Areas/Authentication/Views/Registration/_EmailConfirmed.cshtml
new file mode 100644
index 0000000..2448199
--- /dev/null
+++ b/PortalCMS.Web/Areas/Authentication/Views/Registration/_EmailConfirmed.cshtml
@@ -0,0 +1,20 @@
+@{
+	Layout = "";
+}
+<ul class="nav nav-tabs">
+	<li role="presentation" class="active"><a href="#tab-general" aria-controls="tab-welcome" role="tab" data-toggle="tab">Email Confirmed</a></li>
+</ul>
+
+<div class="tab-content">
+	<div role="tabpanel" class="tab-pane active" id="tab-welcome">
+		<h4>Welcome to @SettingHelper.Get("Website Name")</h4>
+		<p>Thank you for confirming your email address!.</p>
+
+		<br />
+		<div class="alert alert-warning" role="alert">We will be contacting you shortly with some useful information about mentoring over the next few weeks.</div>
+	</div>
+</div>
+
+<div class="footer">
+	<button class="btn" data-dismiss="modal">Cancel</button>
+</div>
diff --git a/PortalCMS.Web/Areas/Authentication/Views/Registration/_RegistrationForm.cshtml b/PortalCMS.Web/Areas/Authentication/Views/Registration/_RegistrationForm.cshtml
new file mode 100644
index 0000000..54ca90a
--- /dev/null
+++ b/PortalCMS.Web/Areas/Authentication/Views/Registration/_RegistrationForm.cshtml
@@ -0,0 +1,42 @@
+@model PortalCMS.Web.Areas.Authentication.ViewModels.Registration.RegisterViewModel
+@{
+	Layout = "";
+	bool recapture = string.IsNullOrEmpty(SettingHelper.Get("Recaptcha Secret Key"));
+}
+@using (Html.BeginForm("Register", "Registration", FormMethod.Post, new { area = "Authentication" }))
+{
+	@Html.AntiForgeryToken()
+
+	@Html.ValidationMessage("GivenName")
+	<div class="control-group">
+		@Html.LabelFor(x => x.GivenName)
+		@Html.TextBoxFor(x => x.GivenName, new { placeholder = "First Name" })
+	</div>
+
+	@Html.ValidationMessage("FamilyName")
+	<div class="control-group">
+		@Html.LabelFor(x => x.FamilyName)
+		@Html.TextBoxFor(x => x.FamilyName, new { placeholder = "Last Name" })
+	</div>
+
+	@Html.ValidationMessage("EmailAddress")
+	@Html.ValidationMessage("EmailAddressUsed")
+	<div class="control-group">
+		@Html.LabelFor(x => x.EmailAddress)
+		@Html.TextBoxFor(x => x.EmailAddress, new { placeholder = "Email Address" })
+	</div>
+
+	@Html.ValidationMessage("Password")
+	<div class="control-group">
+		@Html.LabelFor(x => x.Password)
+		@Html.PasswordFor(x => x.Password, new { placeholder = "Password" })
+	</div>
+
+	<div id="reCaptcha" name="reCaptcha" class="g-recaptcha"></div>
+
+	<div class="button-group float-container">
+		<button class="btn primary">Register</button>
+		<button class="btn" data-dismiss="modal">Cancel</button>
+	</div>
+}
+<script>grecaptcha.render('reCaptcha', { 'sitekey': '@SettingHelper.Get("Recaptcha Site Key")' });</script>
diff --git a/PortalCMS.Web/Areas/Authentication/Views/Registration/_RegistrationSimpleForm.cshtml b/PortalCMS.Web/Areas/Authentication/Views/Registration/_RegistrationSimpleForm.cshtml
new file mode 100644
index 0000000..c839197
--- /dev/null
+++ b/PortalCMS.Web/Areas/Authentication/Views/Registration/_RegistrationSimpleForm.cshtml
@@ -0,0 +1,38 @@
+@model PortalCMS.Web.Areas.Authentication.ViewModels.Registration.RegisterViewModel
+@{
+	Layout = "";
+}
+@using (Html.BeginForm("RegisterSimple", "Registration", FormMethod.Post, new { area = "Authentication" }))
+{
+	@Html.AntiForgeryToken()
+
+	@Html.ValidationMessage("GivenName")
+	<div class="control-group">
+		@Html.LabelFor(x => x.GivenName)
+		@Html.TextBoxFor(x => x.GivenName, new { placeholder = "First Name" })
+	</div>
+
+	@Html.ValidationMessage("FamilyName")
+	<div class="control-group">
+		@Html.LabelFor(x => x.FamilyName)
+		@Html.TextBoxFor(x => x.FamilyName, new { placeholder = "Last Name" })
+	</div>
+
+	@Html.ValidationMessage("EmailAddress")
+	@Html.ValidationMessage("EmailAddressUsed")
+	<div class="control-group">
+		@Html.LabelFor(x => x.EmailAddress)
+		@Html.TextBoxFor(x => x.EmailAddress, new { placeholder = "Email Address" })
+	</div>
+
+	@Html.ValidationMessage("Password")
+	<div class="control-group">
+		@Html.LabelFor(x => x.Password)
+		@Html.PasswordFor(x => x.Password, new { placeholder = "Password" })
+	</div>
+
+	<div class="button-group float-container">
+		<button class="btn primary">Register</button>
+		<button class="btn" data-dismiss="modal">Cancel</button>
+	</div>
+}
diff --git a/PortalCMS.Web/Areas/Authentication/Views/Registration/_Welcome.cshtml b/PortalCMS.Web/Areas/Authentication/Views/Registration/_Welcome.cshtml
new file mode 100644
index 0000000..9200510
--- /dev/null
+++ b/PortalCMS.Web/Areas/Authentication/Views/Registration/_Welcome.cshtml
@@ -0,0 +1,20 @@
+@{
+	Layout = "";
+}
+<ul class="nav nav-tabs">
+	<li role="presentation" class="active"><a href="#tab-general" aria-controls="tab-welcome" role="tab" data-toggle="tab">Welcome</a></li>
+</ul>
+
+<div class="tab-content">
+	<div role="tabpanel" class="tab-pane active" id="tab-welcome">
+		<h4>Welcome to @SettingHelper.Get("Website Name")</h4>
+		<p>Thank you for registering!.</p>
+
+		<br />
+		<div class="alert alert-warning" role="alert">We will be contacting you shortly with some useful information about mentoring over the next few weeks.</div>
+	</div>
+</div>
+
+<div class="footer">
+	<button class="btn" data-dismiss="modal">Cancel</button>
+</div>
diff --git a/Portal.CMS.Web/Areas/Authentication/Views/_ViewStart.cshtml b/PortalCMS.Web/Areas/Authentication/Views/_ViewStart.cshtml
similarity index 100%
rename from Portal.CMS.Web/Areas/Authentication/Views/_ViewStart.cshtml
rename to PortalCMS.Web/Areas/Authentication/Views/_ViewStart.cshtml
diff --git a/Portal.CMS.Web/Areas/Blog/Views/web.config b/PortalCMS.Web/Areas/Authentication/Views/web.config
similarity index 81%
rename from Portal.CMS.Web/Areas/Blog/Views/web.config
rename to PortalCMS.Web/Areas/Authentication/Views/web.config
index adbdbb6..7c3ff4b 100644
--- a/Portal.CMS.Web/Areas/Blog/Views/web.config
+++ b/PortalCMS.Web/Areas/Authentication/Views/web.config
@@ -17,12 +17,12 @@
         <add namespace="System.Web.Mvc.Html" />
         <add namespace="System.Web.Routing" />
         <add namespace="System.Web.Optimization" />
-        <add namespace="Portal.CMS.Web" />
-        <add namespace="Portal.CMS.Web.Architecture.Helpers" />
-        <add namespace="Portal.CMS.Web.Architecture.Extensions" />
-        <add namespace="Portal.CMS.Web.Areas.Admin.ViewModels.Dashboard" />
-        <add namespace="Portal.CMS.Entities.Enumerators" />
-        <add namespace="Portal.CMS.Entities.Entities" />
+        <add namespace="PortalCMS.Web" />
+        <add namespace="PortalCMS.Web.Architecture.Helpers" />
+        <add namespace="PortalCMS.Web.Architecture.Extensions" />
+        <add namespace="PortalCMS.Web.Areas.Admin.ViewModels.Dashboard" />
+        <add namespace="PortalCMS.Entities.Enumerators" />
+        <add namespace="PortalCMS.Entities.Entities" />
       </namespaces>
     </pages>
   </system.web.webPages.razor>
diff --git a/PortalCMS.Web/Areas/BaseController.cs b/PortalCMS.Web/Areas/BaseController.cs
new file mode 100644
index 0000000..b208a3e
--- /dev/null
+++ b/PortalCMS.Web/Areas/BaseController.cs
@@ -0,0 +1,88 @@
+using System.Web.Mvc;
+using System.IO;
+using System.Collections.Generic;
+using System.Web;
+using Microsoft.AspNet.Identity.Owin;
+using Microsoft.AspNet.Identity;
+using PortalCMS.Entities.Entities.Models;
+
+namespace PortalCMS.Web.Controllers.Base
+{
+	public class BaseController : Controller
+	{
+		protected string CurrentUserId
+		{
+			get
+			{
+				if (Request.IsAuthenticated)
+				{
+					return HttpContext.User.Identity.GetUserId();
+				}
+
+				return string.Empty;
+			}
+		}
+
+		protected ApplicationUser CurrentUser
+		{
+			get
+			{
+				if (Request.IsAuthenticated)
+				{
+					return UserManager.FindById(CurrentUserId);
+				}
+
+				return null;
+			}
+		}
+
+		private ApplicationUserManager _userManager;
+		public ApplicationUserManager UserManager
+		{
+			get
+			{
+				return _userManager ?? HttpContext.GetOwinContext().GetUserManager<ApplicationUserManager>();
+			}
+			set
+			{
+				_userManager = value;
+			}
+		}
+
+		private ApplicationRoleManager _roleManager;
+		public ApplicationRoleManager RoleManager
+		{
+			get
+			{
+				return _roleManager ?? HttpContext.GetOwinContext().Get<ApplicationRoleManager>();
+			}
+			private set
+			{
+				_roleManager = value;
+			}
+		}
+
+		protected override void OnActionExecuted(ActionExecutedContext filterContext)
+		{
+			base.OnActionExecuted(filterContext);
+		}
+
+		// This method helps to get the error information from the MVC "ModelState".
+		// We can not directly send the ModelState to the client in Json. The "ModelState"
+		// object has some circular reference that prevents it to be serialized to Json.
+		public Dictionary<string, object> GetErrorsFromModelState()
+		{
+			var errors = new Dictionary<string, object>();
+			foreach (var key in ModelState.Keys)
+			{
+				// Only send the errors to the client.
+				if (ModelState[key].Errors.Count > 0)
+				{
+					errors[key] = ModelState[key].Errors;
+				}
+			}
+
+			return errors;
+		}
+	}
+}
\ No newline at end of file
diff --git a/Portal.CMS.Web/Areas/Blog/BlogAreaRegistration.cs b/PortalCMS.Web/Areas/Blog/BlogAreaRegistration.cs
similarity index 92%
rename from Portal.CMS.Web/Areas/Blog/BlogAreaRegistration.cs
rename to PortalCMS.Web/Areas/Blog/BlogAreaRegistration.cs
index cad9c67..6a263b4 100644
--- a/Portal.CMS.Web/Areas/Blog/BlogAreaRegistration.cs
+++ b/PortalCMS.Web/Areas/Blog/BlogAreaRegistration.cs
@@ -1,6 +1,6 @@
 using System.Web.Mvc;
 
-namespace Portal.CMS.Web.Areas.BlogManager
+namespace PortalCMS.Web.Areas.BlogManager
 {
     public class BlogAreaRegistration : AreaRegistration
     {
diff --git a/Portal.CMS.Web/Areas/Blog/Controllers/ReadController.cs b/PortalCMS.Web/Areas/Blog/Controllers/ReadController.cs
similarity index 74%
rename from Portal.CMS.Web/Areas/Blog/Controllers/ReadController.cs
rename to PortalCMS.Web/Areas/Blog/Controllers/ReadController.cs
index 448a71a..9838fb9 100644
--- a/Portal.CMS.Web/Areas/Blog/Controllers/ReadController.cs
+++ b/PortalCMS.Web/Areas/Blog/Controllers/ReadController.cs
@@ -1,15 +1,15 @@
-using Portal.CMS.Services.Analytics;
-using Portal.CMS.Services.Authentication;
-using Portal.CMS.Services.Posts;
-using Portal.CMS.Services.Themes;
-using Portal.CMS.Web.Architecture.Helpers;
-using Portal.CMS.Web.Areas.BlogManager.ViewModels.Read;
+using PortalCMS.Services.Analytics;
+using PortalCMS.Services.Authentication;
+using PortalCMS.Services.Posts;
+using PortalCMS.Services.Themes;
+using PortalCMS.Web.Architecture.Helpers;
+using PortalCMS.Web.Areas.BlogManager.ViewModels.Read;
 using System.Linq;
 using System.Threading.Tasks;
 using System.Web.Mvc;
 using System.Web.SessionState;
 
-namespace Portal.CMS.Web.Areas.BlogManager.Controllers
+namespace PortalCMS.Web.Areas.BlogManager.Controllers
 {
     [SessionState(SessionStateBehavior.ReadOnly)]
     public class ReadController : Controller
@@ -36,7 +36,7 @@ public ReadController(IPostService postService, IPostCommentService postCommentS
         [HttpGet]
         public async Task<ActionResult> Index(int? id)
         {
-            var recentPosts = await _postService.ReadAsync(UserHelper.UserId, string.Empty);
+            var recentPosts = await _postService.ListByCategoryAsync(UserHelper.Id, string.Empty);
 
             var model = new BlogViewModel
             {
@@ -47,16 +47,16 @@ public async Task<ActionResult> Index(int? id)
                 return RedirectToAction(nameof(Index), "Home", new { area = "" });
 
             if (id.HasValue)
-                model.CurrentPost = await _postService.ReadAsync(UserHelper.UserId, id.Value);
+                model.CurrentPost = await _postService.ReadSingleAsync(UserHelper.Id, id.Value);
             else
                 model.CurrentPost = model.RecentPosts.First();
 
             if (model.CurrentPost == null)
                 return RedirectToAction(nameof(Index), "Home", new { area = "" });
 
-            model.Author = await _userService.GetUserAsync(model.CurrentPost.PostAuthorUserId);
+            model.Author = await _userService.GetAsync(model.CurrentPost.PostAuthorUserId);
 
-            var similiarPosts = await _postService.ReadAsync(UserHelper.UserId, model.CurrentPost.PostCategory.PostCategoryName);
+            var similiarPosts = await _postService.ListByCategoryAsync(UserHelper.Id, model.CurrentPost.PostCategory.PostCategoryName);
 
             model.SimiliarPosts = similiarPosts.ToList();
 
@@ -69,7 +69,7 @@ public async Task<ActionResult> Index(int? id)
         [HttpPost, ValidateAntiForgeryToken]
         public async Task<ActionResult> Comment(int postId, string commentBody)
         {
-            await _postCommentService.AddAsync(UserHelper.UserId.Value, postId, commentBody);
+            await _postCommentService.AddAsync(UserHelper.Id, postId, commentBody);
 
             return RedirectToAction(nameof(Index), "Read", new { postId = postId });
         }
@@ -77,7 +77,7 @@ public async Task<ActionResult> Comment(int postId, string commentBody)
         public async Task<ActionResult> Analytic(int postId, string referrer)
         {
             if (UserHelper.IsLoggedIn)
-                await _analyticsService.LogPostViewAsync(postId, referrer, Request.UserHostAddress, Request.Browser.Browser, UserHelper.UserId);
+                await _analyticsService.LogPostViewAsync(postId, referrer, Request.UserHostAddress, Request.Browser.Browser, UserHelper.Id);
             else
                 await _analyticsService.LogPostViewAsync(postId, referrer, Request.UserHostAddress, Request.Browser.Browser, null);
 
diff --git a/Portal.CMS.Web/Areas/Blog/Controllers/WidgetsController.cs b/PortalCMS.Web/Areas/Blog/Controllers/WidgetsController.cs
similarity index 73%
rename from Portal.CMS.Web/Areas/Blog/Controllers/WidgetsController.cs
rename to PortalCMS.Web/Areas/Blog/Controllers/WidgetsController.cs
index 4f7a577..dddc98d 100644
--- a/Portal.CMS.Web/Areas/Blog/Controllers/WidgetsController.cs
+++ b/PortalCMS.Web/Areas/Blog/Controllers/WidgetsController.cs
@@ -1,12 +1,12 @@
-using Portal.CMS.Services.Posts;
-using Portal.CMS.Web.Architecture.Helpers;
-using Portal.CMS.Web.Areas.Blog.ViewModels.Widgets;
+using PortalCMS.Services.Posts;
+using PortalCMS.Web.Architecture.Helpers;
+using PortalCMS.Web.Areas.Blog.ViewModels.Widgets;
 using System.Linq;
 using System.Threading.Tasks;
 using System.Web.Mvc;
 using System.Web.SessionState;
 
-namespace Portal.CMS.Web.Areas.BlogManager.Controllers
+namespace PortalCMS.Web.Areas.BlogManager.Controllers
 {
     [SessionState(SessionStateBehavior.ReadOnly)]
     public class WidgetsController : Controller
@@ -29,7 +29,7 @@ public ActionResult Index()
 
         public async Task<ActionResult> TilesWidget()
         {
-            var postList = await _postService.ReadAsync(UserHelper.UserId, string.Empty);
+            var postList = await _postService.ListByCategoryAsync(UserHelper.Id, string.Empty);
 
             var model = new PostsWidgetViewModel
             {
@@ -41,7 +41,7 @@ public async Task<ActionResult> TilesWidget()
 
         public async Task<ActionResult> RetroWidget()
         {
-            var postList = await _postService.ReadAsync(UserHelper.UserId, string.Empty);
+            var postList = await _postService.ListByCategoryAsync(UserHelper.Id, string.Empty);
 
             var model = new PostsWidgetViewModel
             {
@@ -53,7 +53,7 @@ public async Task<ActionResult> RetroWidget()
 
         public async Task<ActionResult> BoxWidget()
         {
-            var postList = await _postService.ReadAsync(UserHelper.UserId, string.Empty);
+            var postList = await _postService.ListByCategoryAsync(UserHelper.Id, string.Empty);
 
             var model = new PostsWidgetViewModel
             {
diff --git a/Portal.CMS.Web/Areas/Blog/ViewModels/Read/BlogViewModel.cs b/PortalCMS.Web/Areas/Blog/ViewModels/Read/BlogViewModel.cs
similarity index 55%
rename from Portal.CMS.Web/Areas/Blog/ViewModels/Read/BlogViewModel.cs
rename to PortalCMS.Web/Areas/Blog/ViewModels/Read/BlogViewModel.cs
index 9040abe..bb711b3 100644
--- a/Portal.CMS.Web/Areas/Blog/ViewModels/Read/BlogViewModel.cs
+++ b/PortalCMS.Web/Areas/Blog/ViewModels/Read/BlogViewModel.cs
@@ -1,7 +1,8 @@
-using Portal.CMS.Entities.Entities;
+using PortalCMS.Entities.Entities;
+using PortalCMS.Entities.Entities.Models;
 using System.Collections.Generic;
 
-namespace Portal.CMS.Web.Areas.BlogManager.ViewModels.Read
+namespace PortalCMS.Web.Areas.BlogManager.ViewModels.Read
 {
     public class BlogViewModel
     {
@@ -11,6 +12,6 @@ public class BlogViewModel
 
         public List<Post> SimiliarPosts { get; set; }
 
-        public User Author { get; set; }
+        public ApplicationUser Author { get; set; }
     }
 }
\ No newline at end of file
diff --git a/Portal.CMS.Web/Areas/Blog/ViewModels/Widgets/PostsWidgetViewModel.cs b/PortalCMS.Web/Areas/Blog/ViewModels/Widgets/PostsWidgetViewModel.cs
similarity index 59%
rename from Portal.CMS.Web/Areas/Blog/ViewModels/Widgets/PostsWidgetViewModel.cs
rename to PortalCMS.Web/Areas/Blog/ViewModels/Widgets/PostsWidgetViewModel.cs
index f18a4a3..c8790ba 100644
--- a/Portal.CMS.Web/Areas/Blog/ViewModels/Widgets/PostsWidgetViewModel.cs
+++ b/PortalCMS.Web/Areas/Blog/ViewModels/Widgets/PostsWidgetViewModel.cs
@@ -1,7 +1,7 @@
-using Portal.CMS.Entities.Entities;
+using PortalCMS.Entities.Entities;
 using System.Collections.Generic;
 
-namespace Portal.CMS.Web.Areas.Blog.ViewModels.Widgets
+namespace PortalCMS.Web.Areas.Blog.ViewModels.Widgets
 {
     public class PostsWidgetViewModel
     {
diff --git a/Portal.CMS.Web/Areas/Blog/Views/Read/Index.cshtml b/PortalCMS.Web/Areas/Blog/Views/Read/Index.cshtml
similarity index 97%
rename from Portal.CMS.Web/Areas/Blog/Views/Read/Index.cshtml
rename to PortalCMS.Web/Areas/Blog/Views/Read/Index.cshtml
index 3765dcb..a1d9a10 100644
--- a/Portal.CMS.Web/Areas/Blog/Views/Read/Index.cshtml
+++ b/PortalCMS.Web/Areas/Blog/Views/Read/Index.cshtml
@@ -1,4 +1,4 @@
-@model Portal.CMS.Web.Areas.BlogManager.ViewModels.Read.BlogViewModel
+@model PortalCMS.Web.Areas.BlogManager.ViewModels.Read.BlogViewModel
 @{
     ViewBag.Title = Model.CurrentPost.PostTitle;
 
@@ -107,7 +107,7 @@
                     @if (Model.Author != null)
                     {
                         <div class="post-details float-container">
-                            <img class="pull-left author-image" src="@Model.Author.AvatarImagePath" alt="Author Avatar" style="border-radius: 50%;" />
+                            <img class="pull-left author-image" src="data:image/jpeg;base64,@Convert.ToBase64String(UserHelper.AvatarImage)" alt="Author Avatar" style="border-radius: 50%;" />
                             <div class="pull-left">
                                 <p><strong>Author: </strong>@Model.Author.GivenName @Model.Author.FamilyName</p>
                                 <p><strong>Updated: </strong>@Model.CurrentPost.DateUpdated.ToString("dd MMM yyyy HH:mm")</p>
diff --git a/Portal.CMS.Web/Areas/Blog/Views/Read/_Comments.cshtml b/PortalCMS.Web/Areas/Blog/Views/Read/_Comments.cshtml
similarity index 96%
rename from Portal.CMS.Web/Areas/Blog/Views/Read/_Comments.cshtml
rename to PortalCMS.Web/Areas/Blog/Views/Read/_Comments.cshtml
index 5765260..4e39f9e 100644
--- a/Portal.CMS.Web/Areas/Blog/Views/Read/_Comments.cshtml
+++ b/PortalCMS.Web/Areas/Blog/Views/Read/_Comments.cshtml
@@ -1,4 +1,4 @@
-@model Portal.CMS.Entities.Entities.Post
+@model PortalCMS.Entities.Entities.Post
 
 <div class="comment-item">
     @if (UserHelper.IsLoggedIn)
diff --git a/Portal.CMS.Web/Areas/Blog/Views/Read/_Gallery.cshtml b/PortalCMS.Web/Areas/Blog/Views/Read/_Gallery.cshtml
similarity index 92%
rename from Portal.CMS.Web/Areas/Blog/Views/Read/_Gallery.cshtml
rename to PortalCMS.Web/Areas/Blog/Views/Read/_Gallery.cshtml
index 2f5365e..c6cf660 100644
--- a/Portal.CMS.Web/Areas/Blog/Views/Read/_Gallery.cshtml
+++ b/PortalCMS.Web/Areas/Blog/Views/Read/_Gallery.cshtml
@@ -1,4 +1,4 @@
-@model Portal.CMS.Entities.Entities.Post
+@model PortalCMS.Entities.Entities.Post
 
 <div class="row padding-sides x3">
     @if (!Model.PostImages.Any(x => x.PostImageType == PostImageType.Gallery))
diff --git a/Portal.CMS.Web/Areas/Blog/Views/Read/_List.cshtml b/PortalCMS.Web/Areas/Blog/Views/Read/_List.cshtml
similarity index 96%
rename from Portal.CMS.Web/Areas/Blog/Views/Read/_List.cshtml
rename to PortalCMS.Web/Areas/Blog/Views/Read/_List.cshtml
index 7f7867f..99f7412 100644
--- a/Portal.CMS.Web/Areas/Blog/Views/Read/_List.cshtml
+++ b/PortalCMS.Web/Areas/Blog/Views/Read/_List.cshtml
@@ -1,4 +1,4 @@
-@model List<Portal.CMS.Entities.Entities.Post>
+@model List<PortalCMS.Entities.Entities.Post>
 @{
     var isEditor = UserHelper.IsEditor;
 }
diff --git a/Portal.CMS.Web/Areas/Blog/Views/Widgets/_BoxWidget.cshtml b/PortalCMS.Web/Areas/Blog/Views/Widgets/_BoxWidget.cshtml
similarity index 90%
rename from Portal.CMS.Web/Areas/Blog/Views/Widgets/_BoxWidget.cshtml
rename to PortalCMS.Web/Areas/Blog/Views/Widgets/_BoxWidget.cshtml
index 44987e1..3c4d4e4 100644
--- a/Portal.CMS.Web/Areas/Blog/Views/Widgets/_BoxWidget.cshtml
+++ b/PortalCMS.Web/Areas/Blog/Views/Widgets/_BoxWidget.cshtml
@@ -1,4 +1,4 @@
-@model Portal.CMS.Web.Areas.Blog.ViewModels.Widgets.PostsWidgetViewModel
+@model PortalCMS.Web.Areas.Blog.ViewModels.Widgets.PostsWidgetViewModel
 @{
     Layout = "";
 }
diff --git a/Portal.CMS.Web/Areas/Blog/Views/Widgets/_RetroWidget.cshtml b/PortalCMS.Web/Areas/Blog/Views/Widgets/_RetroWidget.cshtml
similarity index 92%
rename from Portal.CMS.Web/Areas/Blog/Views/Widgets/_RetroWidget.cshtml
rename to PortalCMS.Web/Areas/Blog/Views/Widgets/_RetroWidget.cshtml
index e2e131d..d125fc2 100644
--- a/Portal.CMS.Web/Areas/Blog/Views/Widgets/_RetroWidget.cshtml
+++ b/PortalCMS.Web/Areas/Blog/Views/Widgets/_RetroWidget.cshtml
@@ -1,4 +1,4 @@
-@model Portal.CMS.Web.Areas.Blog.ViewModels.Widgets.PostsWidgetViewModel
+@model PortalCMS.Web.Areas.Blog.ViewModels.Widgets.PostsWidgetViewModel
 @{
     Layout = "";
 }
diff --git a/Portal.CMS.Web/Areas/Blog/Views/Widgets/_TilesWidget.cshtml b/PortalCMS.Web/Areas/Blog/Views/Widgets/_TilesWidget.cshtml
similarity index 93%
rename from Portal.CMS.Web/Areas/Blog/Views/Widgets/_TilesWidget.cshtml
rename to PortalCMS.Web/Areas/Blog/Views/Widgets/_TilesWidget.cshtml
index 8d7ba89..d9bc3f4 100644
--- a/Portal.CMS.Web/Areas/Blog/Views/Widgets/_TilesWidget.cshtml
+++ b/PortalCMS.Web/Areas/Blog/Views/Widgets/_TilesWidget.cshtml
@@ -1,4 +1,4 @@
-@model Portal.CMS.Web.Areas.Blog.ViewModels.Widgets.PostsWidgetViewModel
+@model PortalCMS.Web.Areas.Blog.ViewModels.Widgets.PostsWidgetViewModel
 @{
     Layout = "";
 }
diff --git a/Portal.CMS.Web/Areas/Blog/Views/_ViewStart.cshtml b/PortalCMS.Web/Areas/Blog/Views/_ViewStart.cshtml
similarity index 100%
rename from Portal.CMS.Web/Areas/Blog/Views/_ViewStart.cshtml
rename to PortalCMS.Web/Areas/Blog/Views/_ViewStart.cshtml
diff --git a/Portal.CMS.Web/Areas/Admin/Views/web.config b/PortalCMS.Web/Areas/Blog/Views/web.config
similarity index 81%
rename from Portal.CMS.Web/Areas/Admin/Views/web.config
rename to PortalCMS.Web/Areas/Blog/Views/web.config
index adbdbb6..7c3ff4b 100644
--- a/Portal.CMS.Web/Areas/Admin/Views/web.config
+++ b/PortalCMS.Web/Areas/Blog/Views/web.config
@@ -17,12 +17,12 @@
         <add namespace="System.Web.Mvc.Html" />
         <add namespace="System.Web.Routing" />
         <add namespace="System.Web.Optimization" />
-        <add namespace="Portal.CMS.Web" />
-        <add namespace="Portal.CMS.Web.Architecture.Helpers" />
-        <add namespace="Portal.CMS.Web.Architecture.Extensions" />
-        <add namespace="Portal.CMS.Web.Areas.Admin.ViewModels.Dashboard" />
-        <add namespace="Portal.CMS.Entities.Enumerators" />
-        <add namespace="Portal.CMS.Entities.Entities" />
+        <add namespace="PortalCMS.Web" />
+        <add namespace="PortalCMS.Web.Architecture.Helpers" />
+        <add namespace="PortalCMS.Web.Architecture.Extensions" />
+        <add namespace="PortalCMS.Web.Areas.Admin.ViewModels.Dashboard" />
+        <add namespace="PortalCMS.Entities.Enumerators" />
+        <add namespace="PortalCMS.Entities.Entities" />
       </namespaces>
     </pages>
   </system.web.webPages.razor>
diff --git a/PortalCMS.Web/Areas/Forms/Controllers/ContactWidgetsController.cs b/PortalCMS.Web/Areas/Forms/Controllers/ContactWidgetsController.cs
new file mode 100644
index 0000000..e559e3e
--- /dev/null
+++ b/PortalCMS.Web/Areas/Forms/Controllers/ContactWidgetsController.cs
@@ -0,0 +1,57 @@
+using PortalCMS.Services.Authentication;
+using PortalCMS.Web.Architecture.Helpers;
+using PortalCMS.Web.Areas.Forms.ViewModels.ContactWidgets;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using System.Web.Mvc;
+using System.Web.SessionState;
+
+namespace PortalCMS.Web.Areas.Forms.Controllers
+{
+	[SessionState(SessionStateBehavior.ReadOnly)]
+	public class ContactWidgetsController : Controller
+	{
+		#region Dependencies
+
+		private readonly IUserService _userService;
+
+		public ContactWidgetsController(IUserService userService)
+		{
+			_userService = userService;
+		}
+
+		#endregion Dependencies
+
+		[HttpGet]
+		[OutputCache(Duration = 86400)]
+		public ActionResult SubmitMessageWidget()
+		{
+			var model = new SubmitMessageViewModel();
+
+			if (UserHelper.IsLoggedIn)
+			{
+				model.Name = UserHelper.FullName;
+				model.EmailAddress = UserHelper.Email;
+			}
+
+			return PartialView("_SubmitMessageWidget", model);
+		}
+
+		[HttpPost]
+		[ValidateAntiForgeryToken]
+		public async Task<ActionResult> SubmitMessageWidget(SubmitMessageViewModel model)
+		{
+			var recipients = await _userService.GetByRoleAsync(new List<string> { nameof(Admin) });
+
+			await EmailHelper.SendContactUsMessageAsync(
+					recipients.Select(x => x.Email).First(),
+					model.Name,
+					model.EmailAddress,
+					model.Subject,
+					model.Message);
+
+			return RedirectToAction("Index", "Home", new { area = "" });
+		}
+	}
+}
\ No newline at end of file
diff --git a/Portal.CMS.Web/Areas/Forms/FormsAreaRegistration.cs b/PortalCMS.Web/Areas/Forms/FormsAreaRegistration.cs
similarity index 93%
rename from Portal.CMS.Web/Areas/Forms/FormsAreaRegistration.cs
rename to PortalCMS.Web/Areas/Forms/FormsAreaRegistration.cs
index 41abc62..8292f3c 100644
--- a/Portal.CMS.Web/Areas/Forms/FormsAreaRegistration.cs
+++ b/PortalCMS.Web/Areas/Forms/FormsAreaRegistration.cs
@@ -1,6 +1,6 @@
 using System.Web.Mvc;
 
-namespace Portal.CMS.Web.Areas.Forms
+namespace PortalCMS.Web.Areas.Forms
 {
     public class FormsAreaRegistration : AreaRegistration
     {
diff --git a/Portal.CMS.Web/Areas/Forms/ViewModels/ContactWidgets/SubmitMessageViewModel.cs b/PortalCMS.Web/Areas/Forms/ViewModels/ContactWidgets/SubmitMessageViewModel.cs
similarity index 78%
rename from Portal.CMS.Web/Areas/Forms/ViewModels/ContactWidgets/SubmitMessageViewModel.cs
rename to PortalCMS.Web/Areas/Forms/ViewModels/ContactWidgets/SubmitMessageViewModel.cs
index 4e959f4..461fb92 100644
--- a/Portal.CMS.Web/Areas/Forms/ViewModels/ContactWidgets/SubmitMessageViewModel.cs
+++ b/PortalCMS.Web/Areas/Forms/ViewModels/ContactWidgets/SubmitMessageViewModel.cs
@@ -1,4 +1,4 @@
-namespace Portal.CMS.Web.Areas.Forms.ViewModels.ContactWidgets
+namespace PortalCMS.Web.Areas.Forms.ViewModels.ContactWidgets
 {
     public class SubmitMessageViewModel
     {
diff --git a/Portal.CMS.Web/Areas/Forms/Views/ContactWidgets/_SubmitMessageWidget.cshtml b/PortalCMS.Web/Areas/Forms/Views/ContactWidgets/_SubmitMessageWidget.cshtml
similarity index 89%
rename from Portal.CMS.Web/Areas/Forms/Views/ContactWidgets/_SubmitMessageWidget.cshtml
rename to PortalCMS.Web/Areas/Forms/Views/ContactWidgets/_SubmitMessageWidget.cshtml
index 10be642..5500d7e 100644
--- a/Portal.CMS.Web/Areas/Forms/Views/ContactWidgets/_SubmitMessageWidget.cshtml
+++ b/PortalCMS.Web/Areas/Forms/Views/ContactWidgets/_SubmitMessageWidget.cshtml
@@ -1,4 +1,4 @@
-@model Portal.CMS.Web.Areas.Forms.ViewModels.ContactWidgets.SubmitMessageViewModel
+@model PortalCMS.Web.Areas.Forms.ViewModels.ContactWidgets.SubmitMessageViewModel
 @{
     Layout = null;
 }
diff --git a/Portal.CMS.Web/Areas/Forms/Views/web.config b/PortalCMS.Web/Areas/Forms/Views/web.config
similarity index 97%
rename from Portal.CMS.Web/Areas/Forms/Views/web.config
rename to PortalCMS.Web/Areas/Forms/Views/web.config
index 693a37c..24a2a1e 100644
--- a/Portal.CMS.Web/Areas/Forms/Views/web.config
+++ b/PortalCMS.Web/Areas/Forms/Views/web.config
@@ -17,7 +17,7 @@
         <add namespace="System.Web.Mvc.Html" />
         <add namespace="System.Web.Routing" />
         <add namespace="System.Web.Optimization" />
-        <add namespace="Portal.CMS.Web" />
+        <add namespace="PortalCMS.Web" />
       </namespaces>
     </pages>
   </system.web.webPages.razor>
diff --git a/Portal.CMS.Web/Areas/PageBuilder/Content/Images/Sample/Sample-1.jpg b/PortalCMS.Web/Areas/PageBuilder/Content/Images/Sample/Sample-1.jpg
similarity index 100%
rename from Portal.CMS.Web/Areas/PageBuilder/Content/Images/Sample/Sample-1.jpg
rename to PortalCMS.Web/Areas/PageBuilder/Content/Images/Sample/Sample-1.jpg
diff --git a/Portal.CMS.Web/Areas/PageBuilder/Content/Images/Sample/Sample-2.jpg b/PortalCMS.Web/Areas/PageBuilder/Content/Images/Sample/Sample-2.jpg
similarity index 100%
rename from Portal.CMS.Web/Areas/PageBuilder/Content/Images/Sample/Sample-2.jpg
rename to PortalCMS.Web/Areas/PageBuilder/Content/Images/Sample/Sample-2.jpg
diff --git a/Portal.CMS.Web/Areas/PageBuilder/Content/Images/Sample/Sample-3.jpg b/PortalCMS.Web/Areas/PageBuilder/Content/Images/Sample/Sample-3.jpg
similarity index 100%
rename from Portal.CMS.Web/Areas/PageBuilder/Content/Images/Sample/Sample-3.jpg
rename to PortalCMS.Web/Areas/PageBuilder/Content/Images/Sample/Sample-3.jpg
diff --git a/Portal.CMS.Web/Areas/PageBuilder/Content/Images/Sample/Sample-4.jpg b/PortalCMS.Web/Areas/PageBuilder/Content/Images/Sample/Sample-4.jpg
similarity index 100%
rename from Portal.CMS.Web/Areas/PageBuilder/Content/Images/Sample/Sample-4.jpg
rename to PortalCMS.Web/Areas/PageBuilder/Content/Images/Sample/Sample-4.jpg
diff --git a/Portal.CMS.Web/Areas/PageBuilder/Content/Images/Sample/Sample-5.jpg b/PortalCMS.Web/Areas/PageBuilder/Content/Images/Sample/Sample-5.jpg
similarity index 100%
rename from Portal.CMS.Web/Areas/PageBuilder/Content/Images/Sample/Sample-5.jpg
rename to PortalCMS.Web/Areas/PageBuilder/Content/Images/Sample/Sample-5.jpg
diff --git a/Portal.CMS.Web/Areas/PageBuilder/Content/Images/Sample/Sample-6.jpg b/PortalCMS.Web/Areas/PageBuilder/Content/Images/Sample/Sample-6.jpg
similarity index 100%
rename from Portal.CMS.Web/Areas/PageBuilder/Content/Images/Sample/Sample-6.jpg
rename to PortalCMS.Web/Areas/PageBuilder/Content/Images/Sample/Sample-6.jpg
diff --git a/Portal.CMS.Web/Areas/PageBuilder/Content/Images/Sample/Sample-8.jpg b/PortalCMS.Web/Areas/PageBuilder/Content/Images/Sample/Sample-8.jpg
similarity index 100%
rename from Portal.CMS.Web/Areas/PageBuilder/Content/Images/Sample/Sample-8.jpg
rename to PortalCMS.Web/Areas/PageBuilder/Content/Images/Sample/Sample-8.jpg
diff --git a/Portal.CMS.Web/Areas/PageBuilder/Content/Images/Sample/icon-1.png b/PortalCMS.Web/Areas/PageBuilder/Content/Images/Sample/icon-1.png
similarity index 100%
rename from Portal.CMS.Web/Areas/PageBuilder/Content/Images/Sample/icon-1.png
rename to PortalCMS.Web/Areas/PageBuilder/Content/Images/Sample/icon-1.png
diff --git a/Portal.CMS.Web/Areas/PageBuilder/Content/Images/Sample/icon-10.png b/PortalCMS.Web/Areas/PageBuilder/Content/Images/Sample/icon-10.png
similarity index 100%
rename from Portal.CMS.Web/Areas/PageBuilder/Content/Images/Sample/icon-10.png
rename to PortalCMS.Web/Areas/PageBuilder/Content/Images/Sample/icon-10.png
diff --git a/Portal.CMS.Web/Areas/PageBuilder/Content/Images/Sample/icon-11.png b/PortalCMS.Web/Areas/PageBuilder/Content/Images/Sample/icon-11.png
similarity index 100%
rename from Portal.CMS.Web/Areas/PageBuilder/Content/Images/Sample/icon-11.png
rename to PortalCMS.Web/Areas/PageBuilder/Content/Images/Sample/icon-11.png
diff --git a/Portal.CMS.Web/Areas/PageBuilder/Content/Images/Sample/icon-12.png b/PortalCMS.Web/Areas/PageBuilder/Content/Images/Sample/icon-12.png
similarity index 100%
rename from Portal.CMS.Web/Areas/PageBuilder/Content/Images/Sample/icon-12.png
rename to PortalCMS.Web/Areas/PageBuilder/Content/Images/Sample/icon-12.png
diff --git a/Portal.CMS.Web/Areas/PageBuilder/Content/Images/Sample/icon-2.png b/PortalCMS.Web/Areas/PageBuilder/Content/Images/Sample/icon-2.png
similarity index 100%
rename from Portal.CMS.Web/Areas/PageBuilder/Content/Images/Sample/icon-2.png
rename to PortalCMS.Web/Areas/PageBuilder/Content/Images/Sample/icon-2.png
diff --git a/Portal.CMS.Web/Areas/PageBuilder/Content/Images/Sample/icon-3.png b/PortalCMS.Web/Areas/PageBuilder/Content/Images/Sample/icon-3.png
similarity index 100%
rename from Portal.CMS.Web/Areas/PageBuilder/Content/Images/Sample/icon-3.png
rename to PortalCMS.Web/Areas/PageBuilder/Content/Images/Sample/icon-3.png
diff --git a/Portal.CMS.Web/Areas/PageBuilder/Content/Images/Sample/icon-4.png b/PortalCMS.Web/Areas/PageBuilder/Content/Images/Sample/icon-4.png
similarity index 100%
rename from Portal.CMS.Web/Areas/PageBuilder/Content/Images/Sample/icon-4.png
rename to PortalCMS.Web/Areas/PageBuilder/Content/Images/Sample/icon-4.png
diff --git a/Portal.CMS.Web/Areas/PageBuilder/Content/Images/Sample/icon-5.png b/PortalCMS.Web/Areas/PageBuilder/Content/Images/Sample/icon-5.png
similarity index 100%
rename from Portal.CMS.Web/Areas/PageBuilder/Content/Images/Sample/icon-5.png
rename to PortalCMS.Web/Areas/PageBuilder/Content/Images/Sample/icon-5.png
diff --git a/Portal.CMS.Web/Areas/PageBuilder/Content/Images/Sample/icon-6.png b/PortalCMS.Web/Areas/PageBuilder/Content/Images/Sample/icon-6.png
similarity index 100%
rename from Portal.CMS.Web/Areas/PageBuilder/Content/Images/Sample/icon-6.png
rename to PortalCMS.Web/Areas/PageBuilder/Content/Images/Sample/icon-6.png
diff --git a/Portal.CMS.Web/Areas/PageBuilder/Content/Images/Sample/icon-7.png b/PortalCMS.Web/Areas/PageBuilder/Content/Images/Sample/icon-7.png
similarity index 100%
rename from Portal.CMS.Web/Areas/PageBuilder/Content/Images/Sample/icon-7.png
rename to PortalCMS.Web/Areas/PageBuilder/Content/Images/Sample/icon-7.png
diff --git a/Portal.CMS.Web/Areas/PageBuilder/Content/Images/Sample/icon-8.png b/PortalCMS.Web/Areas/PageBuilder/Content/Images/Sample/icon-8.png
similarity index 100%
rename from Portal.CMS.Web/Areas/PageBuilder/Content/Images/Sample/icon-8.png
rename to PortalCMS.Web/Areas/PageBuilder/Content/Images/Sample/icon-8.png
diff --git a/Portal.CMS.Web/Areas/PageBuilder/Content/Images/Sample/icon-9.png b/PortalCMS.Web/Areas/PageBuilder/Content/Images/Sample/icon-9.png
similarity index 100%
rename from Portal.CMS.Web/Areas/PageBuilder/Content/Images/Sample/icon-9.png
rename to PortalCMS.Web/Areas/PageBuilder/Content/Images/Sample/icon-9.png
diff --git a/Portal.CMS.Web/Areas/PageBuilder/Content/Images/Sample/loading-graphic.gif b/PortalCMS.Web/Areas/PageBuilder/Content/Images/Sample/loading-graphic.gif
similarity index 100%
rename from Portal.CMS.Web/Areas/PageBuilder/Content/Images/Sample/loading-graphic.gif
rename to PortalCMS.Web/Areas/PageBuilder/Content/Images/Sample/loading-graphic.gif
diff --git a/Portal.CMS.Web/Areas/PageBuilder/Content/Images/Sample/pattern-1.png b/PortalCMS.Web/Areas/PageBuilder/Content/Images/Sample/pattern-1.png
similarity index 100%
rename from Portal.CMS.Web/Areas/PageBuilder/Content/Images/Sample/pattern-1.png
rename to PortalCMS.Web/Areas/PageBuilder/Content/Images/Sample/pattern-1.png
diff --git a/Portal.CMS.Web/Areas/PageBuilder/Content/Images/Sample/quote-image-left.png b/PortalCMS.Web/Areas/PageBuilder/Content/Images/Sample/quote-image-left.png
similarity index 100%
rename from Portal.CMS.Web/Areas/PageBuilder/Content/Images/Sample/quote-image-left.png
rename to PortalCMS.Web/Areas/PageBuilder/Content/Images/Sample/quote-image-left.png
diff --git a/Portal.CMS.Web/Areas/PageBuilder/Content/Images/Sample/quote-image-right.png b/PortalCMS.Web/Areas/PageBuilder/Content/Images/Sample/quote-image-right.png
similarity index 100%
rename from Portal.CMS.Web/Areas/PageBuilder/Content/Images/Sample/quote-image-right.png
rename to PortalCMS.Web/Areas/PageBuilder/Content/Images/Sample/quote-image-right.png
diff --git a/Portal.CMS.Web/Areas/PageBuilder/Content/Images/Sample/sample-7.jpg b/PortalCMS.Web/Areas/PageBuilder/Content/Images/Sample/sample-7.jpg
similarity index 100%
rename from Portal.CMS.Web/Areas/PageBuilder/Content/Images/Sample/sample-7.jpg
rename to PortalCMS.Web/Areas/PageBuilder/Content/Images/Sample/sample-7.jpg
diff --git a/Portal.CMS.Web/Areas/PageBuilder/Content/Images/Sample/sample-9.png b/PortalCMS.Web/Areas/PageBuilder/Content/Images/Sample/sample-9.png
similarity index 100%
rename from Portal.CMS.Web/Areas/PageBuilder/Content/Images/Sample/sample-9.png
rename to PortalCMS.Web/Areas/PageBuilder/Content/Images/Sample/sample-9.png
diff --git a/Portal.CMS.Web/Areas/PageBuilder/Content/Images/Sample/sample-help.png b/PortalCMS.Web/Areas/PageBuilder/Content/Images/Sample/sample-help.png
similarity index 100%
rename from Portal.CMS.Web/Areas/PageBuilder/Content/Images/Sample/sample-help.png
rename to PortalCMS.Web/Areas/PageBuilder/Content/Images/Sample/sample-help.png
diff --git a/Portal.CMS.Web/Areas/PageBuilder/Content/Images/Sample/sample-rocket.png b/PortalCMS.Web/Areas/PageBuilder/Content/Images/Sample/sample-rocket.png
similarity index 100%
rename from Portal.CMS.Web/Areas/PageBuilder/Content/Images/Sample/sample-rocket.png
rename to PortalCMS.Web/Areas/PageBuilder/Content/Images/Sample/sample-rocket.png
diff --git a/Portal.CMS.Web/Areas/PageBuilder/Content/Images/Sample/small-sample-1.jpg b/PortalCMS.Web/Areas/PageBuilder/Content/Images/Sample/small-sample-1.jpg
similarity index 100%
rename from Portal.CMS.Web/Areas/PageBuilder/Content/Images/Sample/small-sample-1.jpg
rename to PortalCMS.Web/Areas/PageBuilder/Content/Images/Sample/small-sample-1.jpg
diff --git a/Portal.CMS.Web/Areas/PageBuilder/Content/Images/Sample/texture-lightgray.png b/PortalCMS.Web/Areas/PageBuilder/Content/Images/Sample/texture-lightgray.png
similarity index 100%
rename from Portal.CMS.Web/Areas/PageBuilder/Content/Images/Sample/texture-lightgray.png
rename to PortalCMS.Web/Areas/PageBuilder/Content/Images/Sample/texture-lightgray.png
diff --git a/Portal.CMS.Web/Areas/PageBuilder/Content/Images/Sample/texture-linen.png b/PortalCMS.Web/Areas/PageBuilder/Content/Images/Sample/texture-linen.png
similarity index 100%
rename from Portal.CMS.Web/Areas/PageBuilder/Content/Images/Sample/texture-linen.png
rename to PortalCMS.Web/Areas/PageBuilder/Content/Images/Sample/texture-linen.png
diff --git a/Portal.CMS.Web/Areas/PageBuilder/Content/Images/Sample/texture-notebook.png b/PortalCMS.Web/Areas/PageBuilder/Content/Images/Sample/texture-notebook.png
similarity index 100%
rename from Portal.CMS.Web/Areas/PageBuilder/Content/Images/Sample/texture-notebook.png
rename to PortalCMS.Web/Areas/PageBuilder/Content/Images/Sample/texture-notebook.png
diff --git a/Portal.CMS.Web/Areas/PageBuilder/Content/Images/Sample/texture-office.png b/PortalCMS.Web/Areas/PageBuilder/Content/Images/Sample/texture-office.png
similarity index 100%
rename from Portal.CMS.Web/Areas/PageBuilder/Content/Images/Sample/texture-office.png
rename to PortalCMS.Web/Areas/PageBuilder/Content/Images/Sample/texture-office.png
diff --git a/Portal.CMS.Web/Areas/PageBuilder/Content/Images/Toolbar/mce-trash.png b/PortalCMS.Web/Areas/PageBuilder/Content/Images/Toolbar/mce-trash.png
similarity index 100%
rename from Portal.CMS.Web/Areas/PageBuilder/Content/Images/Toolbar/mce-trash.png
rename to PortalCMS.Web/Areas/PageBuilder/Content/Images/Toolbar/mce-trash.png
diff --git a/Portal.CMS.Web/Areas/PageBuilder/Controllers/AssociationController.cs b/PortalCMS.Web/Areas/PageBuilder/Controllers/AssociationController.cs
similarity index 89%
rename from Portal.CMS.Web/Areas/PageBuilder/Controllers/AssociationController.cs
rename to PortalCMS.Web/Areas/PageBuilder/Controllers/AssociationController.cs
index b952bc0..8346f3f 100644
--- a/Portal.CMS.Web/Areas/PageBuilder/Controllers/AssociationController.cs
+++ b/PortalCMS.Web/Areas/PageBuilder/Controllers/AssociationController.cs
@@ -1,7 +1,7 @@
-using Portal.CMS.Services.Authentication;
-using Portal.CMS.Services.PageBuilder;
-using Portal.CMS.Web.Architecture.ActionFilters;
-using Portal.CMS.Web.Areas.PageBuilder.ViewModels.Association;
+using PortalCMS.Services.Authentication;
+using PortalCMS.Services.PageBuilder;
+using PortalCMS.Web.Architecture.ActionFilters;
+using PortalCMS.Web.Areas.PageBuilder.ViewModels.Association;
 using System;
 using System.Linq;
 using System.Net;
@@ -9,7 +9,7 @@
 using System.Web.Mvc;
 using System.Web.SessionState;
 
-namespace Portal.CMS.Web.Areas.PageBuilder.Controllers
+namespace PortalCMS.Web.Areas.PageBuilder.Controllers
 {
     [AdminFilter(ActionFilterResponseType.Modal)]
     [SessionState(SessionStateBehavior.ReadOnly)]
@@ -56,7 +56,7 @@ public async Task<ActionResult> EditAccess(int pageAssociationId)
             {
                 PageAssociationId = pageAssociationId,
                 RoleList = await _roleService.GetAsync(),
-                SelectedRoleList = pageAssociation.PageAssociationRoles.Select(x => x.Role.RoleName).ToList()
+                SelectedRoleList = pageAssociation.PageAssociationRoles.Select(x => x.Role.Name).ToList()
             };
 
             return View("_EditAccess", model);
diff --git a/Portal.CMS.Web/Areas/PageBuilder/Controllers/ComponentController.cs b/PortalCMS.Web/Areas/PageBuilder/Controllers/ComponentController.cs
similarity index 94%
rename from Portal.CMS.Web/Areas/PageBuilder/Controllers/ComponentController.cs
rename to PortalCMS.Web/Areas/PageBuilder/Controllers/ComponentController.cs
index 09fa5fa..c21d559 100644
--- a/Portal.CMS.Web/Areas/PageBuilder/Controllers/ComponentController.cs
+++ b/PortalCMS.Web/Areas/PageBuilder/Controllers/ComponentController.cs
@@ -1,17 +1,17 @@
-using Portal.CMS.Entities.Enumerators;
-using Portal.CMS.Services.Generic;
-using Portal.CMS.Services.PageBuilder;
-using Portal.CMS.Web.Architecture.ActionFilters;
-using Portal.CMS.Web.Architecture.Extensions;
-using Portal.CMS.Web.Areas.PageBuilder.ViewModels.Component;
-using Portal.CMS.Web.ViewModels.Shared;
+using PortalCMS.Entities.Enumerators;
+using PortalCMS.Services.Generic;
+using PortalCMS.Services.PageBuilder;
+using PortalCMS.Web.Architecture.ActionFilters;
+using PortalCMS.Web.Architecture.Extensions;
+using PortalCMS.Web.Areas.PageBuilder.ViewModels.Component;
+using PortalCMS.Web.ViewModels.Shared;
 using System;
 using System.Linq;
 using System.Threading.Tasks;
 using System.Web.Mvc;
 using System.Web.SessionState;
 
-namespace Portal.CMS.Web.Areas.PageBuilder.Controllers
+namespace PortalCMS.Web.Areas.PageBuilder.Controllers
 {
     [AdminFilter(ActionFilterResponseType.Modal)]
     [SessionState(SessionStateBehavior.ReadOnly)]
diff --git a/Portal.CMS.Web/Areas/PageBuilder/Controllers/ErrorController.cs b/PortalCMS.Web/Areas/PageBuilder/Controllers/ErrorController.cs
similarity index 88%
rename from Portal.CMS.Web/Areas/PageBuilder/Controllers/ErrorController.cs
rename to PortalCMS.Web/Areas/PageBuilder/Controllers/ErrorController.cs
index c9990ce..458f4ad 100644
--- a/Portal.CMS.Web/Areas/PageBuilder/Controllers/ErrorController.cs
+++ b/PortalCMS.Web/Areas/PageBuilder/Controllers/ErrorController.cs
@@ -1,7 +1,7 @@
 using System.Web.Mvc;
 using System.Web.SessionState;
 
-namespace Portal.CMS.Web.Areas.PageBuilder.Controllers
+namespace PortalCMS.Web.Areas.PageBuilder.Controllers
 {
     [SessionState(SessionStateBehavior.ReadOnly)]
     public class ErrorController : Controller
diff --git a/Portal.CMS.Web/Areas/PageBuilder/Controllers/PageController.cs b/PortalCMS.Web/Areas/PageBuilder/Controllers/PageController.cs
similarity index 88%
rename from Portal.CMS.Web/Areas/PageBuilder/Controllers/PageController.cs
rename to PortalCMS.Web/Areas/PageBuilder/Controllers/PageController.cs
index 2e3fb3c..34225c7 100644
--- a/Portal.CMS.Web/Areas/PageBuilder/Controllers/PageController.cs
+++ b/PortalCMS.Web/Areas/PageBuilder/Controllers/PageController.cs
@@ -1,11 +1,11 @@
-using Portal.CMS.Services.Analytics;
-using Portal.CMS.Services.PageBuilder;
-using Portal.CMS.Web.Architecture.Helpers;
+using PortalCMS.Services.Analytics;
+using PortalCMS.Services.PageBuilder;
+using PortalCMS.Web.Architecture.Helpers;
 using System.Threading.Tasks;
 using System.Web.Mvc;
 using System.Web.SessionState;
 
-namespace Portal.CMS.Web.Areas.PageBuilder.Controllers
+namespace PortalCMS.Web.Areas.PageBuilder.Controllers
 {
     [SessionState(SessionStateBehavior.ReadOnly)]
     public class PageController : Controller
@@ -26,7 +26,7 @@ public async Task<ActionResult> Index(int pageId = 0)
             if (pageId == 0)
                 return RedirectToAction(nameof(Index), "Home", new { area = "" });
 
-            var currentPage = await _pageService.ViewAsync(UserHelper.UserId, pageId);
+            var currentPage = await _pageService.ViewAsync(UserHelper.Id, pageId);
 
             if (currentPage == null)
             {
@@ -50,7 +50,7 @@ public async Task<ActionResult> Analytic(int pageId, string referrer)
             var page = await _pageService.GetAsync(pageId);
 
             if (UserHelper.IsLoggedIn)
-                await _analyticService.LogPageViewAsync(page.PageArea, page.PageController, page.PageAction, referrer, Request.UserHostAddress, Request.Browser.Browser, UserHelper.UserId);
+                await _analyticService.LogPageViewAsync(page.PageArea, page.PageController, page.PageAction, referrer, Request.UserHostAddress, Request.Browser.Browser, UserHelper.Id);
             else
                 await _analyticService.LogPageViewAsync(page.PageArea, page.PageController, page.PageAction, referrer, Request.UserHostAddress, Request.Browser.Browser, null);
 
diff --git a/Portal.CMS.Web/Areas/PageBuilder/Controllers/PartialController.cs b/PortalCMS.Web/Areas/PageBuilder/Controllers/PartialController.cs
similarity index 90%
rename from Portal.CMS.Web/Areas/PageBuilder/Controllers/PartialController.cs
rename to PortalCMS.Web/Areas/PageBuilder/Controllers/PartialController.cs
index b450f54..5c0a0f8 100644
--- a/Portal.CMS.Web/Areas/PageBuilder/Controllers/PartialController.cs
+++ b/PortalCMS.Web/Areas/PageBuilder/Controllers/PartialController.cs
@@ -1,12 +1,12 @@
-using Portal.CMS.Services.PageBuilder;
-using Portal.CMS.Web.Architecture.ActionFilters;
+using PortalCMS.Services.PageBuilder;
+using PortalCMS.Web.Architecture.ActionFilters;
 using System;
 using System.Linq;
 using System.Threading.Tasks;
 using System.Web.Mvc;
 using System.Web.SessionState;
 
-namespace Portal.CMS.Web.Areas.PageBuilder.Controllers
+namespace PortalCMS.Web.Areas.PageBuilder.Controllers
 {
     [AdminFilter(ActionFilterResponseType.Modal)]
     [SessionState(SessionStateBehavior.ReadOnly)]
diff --git a/Portal.CMS.Web/Areas/PageBuilder/Controllers/SectionController.cs b/PortalCMS.Web/Areas/PageBuilder/Controllers/SectionController.cs
similarity index 95%
rename from Portal.CMS.Web/Areas/PageBuilder/Controllers/SectionController.cs
rename to PortalCMS.Web/Areas/PageBuilder/Controllers/SectionController.cs
index be8151f..344ebdc 100644
--- a/Portal.CMS.Web/Areas/PageBuilder/Controllers/SectionController.cs
+++ b/PortalCMS.Web/Areas/PageBuilder/Controllers/SectionController.cs
@@ -1,10 +1,10 @@
-using Portal.CMS.Services.Authentication;
-using Portal.CMS.Services.Generic;
-using Portal.CMS.Services.PageBuilder;
-using Portal.CMS.Web.Architecture.ActionFilters;
-using Portal.CMS.Web.Architecture.Extensions;
-using Portal.CMS.Web.Areas.PageBuilder.ViewModels.Section;
-using Portal.CMS.Web.ViewModels.Shared;
+using PortalCMS.Services.Authentication;
+using PortalCMS.Services.Generic;
+using PortalCMS.Services.PageBuilder;
+using PortalCMS.Web.Architecture.ActionFilters;
+using PortalCMS.Web.Architecture.Extensions;
+using PortalCMS.Web.Areas.PageBuilder.ViewModels.Section;
+using PortalCMS.Web.ViewModels.Shared;
 using System;
 using System.Linq;
 using System.Net;
@@ -12,7 +12,7 @@
 using System.Web.Mvc;
 using System.Web.SessionState;
 
-namespace Portal.CMS.Web.Areas.PageBuilder.Controllers
+namespace PortalCMS.Web.Areas.PageBuilder.Controllers
 {
     [AdminFilter(ActionFilterResponseType.Modal)]
     [SessionState(SessionStateBehavior.ReadOnly)]
diff --git a/Portal.CMS.Web/Areas/PageBuilder/Controllers/ThemeController.cs b/PortalCMS.Web/Areas/PageBuilder/Controllers/ThemeController.cs
similarity index 75%
rename from Portal.CMS.Web/Areas/PageBuilder/Controllers/ThemeController.cs
rename to PortalCMS.Web/Areas/PageBuilder/Controllers/ThemeController.cs
index 70c956b..9835878 100644
--- a/Portal.CMS.Web/Areas/PageBuilder/Controllers/ThemeController.cs
+++ b/PortalCMS.Web/Areas/PageBuilder/Controllers/ThemeController.cs
@@ -1,10 +1,10 @@
-using Portal.CMS.Services.Themes;
-using Portal.CMS.Web.Architecture.Helpers;
-using Portal.CMS.Web.Areas.PageBuilder.ViewModels.Theme;
+using PortalCMS.Services.Themes;
+using PortalCMS.Web.Architecture.Helpers;
+using PortalCMS.Web.Areas.PageBuilder.ViewModels.Theme;
 using System.Web.Mvc;
 using System.Web.SessionState;
 
-namespace Portal.CMS.Web.Areas.PageBuilder.Controllers
+namespace PortalCMS.Web.Areas.PageBuilder.Controllers
 {
     [SessionState(SessionStateBehavior.ReadOnly)]
     public class ThemeController : Controller
diff --git a/Portal.CMS.Web/Areas/PageBuilder/PageBuilderAreaRegistration.cs b/PortalCMS.Web/Areas/PageBuilder/PageBuilderAreaRegistration.cs
similarity index 92%
rename from Portal.CMS.Web/Areas/PageBuilder/PageBuilderAreaRegistration.cs
rename to PortalCMS.Web/Areas/PageBuilder/PageBuilderAreaRegistration.cs
index b2fe70c..e3f07cc 100644
--- a/Portal.CMS.Web/Areas/PageBuilder/PageBuilderAreaRegistration.cs
+++ b/PortalCMS.Web/Areas/PageBuilder/PageBuilderAreaRegistration.cs
@@ -1,6 +1,6 @@
 using System.Web.Mvc;
 
-namespace Portal.CMS.Web.Areas.PageBuilder
+namespace PortalCMS.Web.Areas.PageBuilder
 {
     public class PageBuilderAreaRegistration : AreaRegistration
     {
diff --git a/Portal.CMS.Web/Areas/PageBuilder/ViewModels/Association/EditAccessViewModel.cs b/PortalCMS.Web/Areas/PageBuilder/ViewModels/Association/EditAccessViewModel.cs
similarity index 54%
rename from Portal.CMS.Web/Areas/PageBuilder/ViewModels/Association/EditAccessViewModel.cs
rename to PortalCMS.Web/Areas/PageBuilder/ViewModels/Association/EditAccessViewModel.cs
index e20c7a2..fb08e3a 100644
--- a/Portal.CMS.Web/Areas/PageBuilder/ViewModels/Association/EditAccessViewModel.cs
+++ b/PortalCMS.Web/Areas/PageBuilder/ViewModels/Association/EditAccessViewModel.cs
@@ -1,16 +1,16 @@
-using Portal.CMS.Entities.Entities;
+using PortalCMS.Entities.Entities.Models;
 using System.Collections.Generic;
 using System.ComponentModel;
 
-namespace Portal.CMS.Web.Areas.PageBuilder.ViewModels.Association
+namespace PortalCMS.Web.Areas.PageBuilder.ViewModels.Association
 {
-    public class EditAccessViewModel
+	public class EditAccessViewModel
     {
         public int PageAssociationId { get; set; }
 
         [DisplayName("Roles")]
         public List<string> SelectedRoleList { get; set; } = new List<string>();
 
-        public List<Role> RoleList { get; set; }
+        public List<ApplicationRole> RoleList { get; set; }
     }
 }
\ No newline at end of file
diff --git a/Portal.CMS.Web/Areas/PageBuilder/ViewModels/Component/AddViewModel.cs b/PortalCMS.Web/Areas/PageBuilder/ViewModels/Component/AddViewModel.cs
similarity index 67%
rename from Portal.CMS.Web/Areas/PageBuilder/ViewModels/Component/AddViewModel.cs
rename to PortalCMS.Web/Areas/PageBuilder/ViewModels/Component/AddViewModel.cs
index 5f38bb2..a985ce2 100644
--- a/Portal.CMS.Web/Areas/PageBuilder/ViewModels/Component/AddViewModel.cs
+++ b/PortalCMS.Web/Areas/PageBuilder/ViewModels/Component/AddViewModel.cs
@@ -1,7 +1,7 @@
-using Portal.CMS.Entities.Entities;
+using PortalCMS.Entities.Entities;
 using System.Collections.Generic;
 
-namespace Portal.CMS.Web.Areas.PageBuilder.ViewModels.Component
+namespace PortalCMS.Web.Areas.PageBuilder.ViewModels.Component
 {
     public class AddViewModel
     {
diff --git a/Portal.CMS.Web/Areas/PageBuilder/ViewModels/Component/ContainerViewModel.cs b/PortalCMS.Web/Areas/PageBuilder/ViewModels/Component/ContainerViewModel.cs
similarity index 70%
rename from Portal.CMS.Web/Areas/PageBuilder/ViewModels/Component/ContainerViewModel.cs
rename to PortalCMS.Web/Areas/PageBuilder/ViewModels/Component/ContainerViewModel.cs
index e165ff4..64ddb49 100644
--- a/Portal.CMS.Web/Areas/PageBuilder/ViewModels/Component/ContainerViewModel.cs
+++ b/PortalCMS.Web/Areas/PageBuilder/ViewModels/Component/ContainerViewModel.cs
@@ -1,7 +1,7 @@
-using Portal.CMS.Entities.Enumerators;
+using PortalCMS.Entities.Enumerators;
 using System.ComponentModel;
 
-namespace Portal.CMS.Web.Areas.PageBuilder.ViewModels.Component
+namespace PortalCMS.Web.Areas.PageBuilder.ViewModels.Component
 {
     public class ContainerViewModel
     {
diff --git a/Portal.CMS.Web/Areas/PageBuilder/ViewModels/Component/ImageViewModel.cs b/PortalCMS.Web/Areas/PageBuilder/ViewModels/Component/ImageViewModel.cs
similarity index 86%
rename from Portal.CMS.Web/Areas/PageBuilder/ViewModels/Component/ImageViewModel.cs
rename to PortalCMS.Web/Areas/PageBuilder/ViewModels/Component/ImageViewModel.cs
index 66d749b..804af56 100644
--- a/Portal.CMS.Web/Areas/PageBuilder/ViewModels/Component/ImageViewModel.cs
+++ b/PortalCMS.Web/Areas/PageBuilder/ViewModels/Component/ImageViewModel.cs
@@ -1,6 +1,6 @@
-using Portal.CMS.Web.ViewModels.Shared;
+using PortalCMS.Web.ViewModels.Shared;
 
-namespace Portal.CMS.Web.Areas.PageBuilder.ViewModels.Component
+namespace PortalCMS.Web.Areas.PageBuilder.ViewModels.Component
 {
     public class ImageViewModel
     {
diff --git a/Portal.CMS.Web/Areas/PageBuilder/ViewModels/Component/VideoViewModel.cs b/PortalCMS.Web/Areas/PageBuilder/ViewModels/Component/VideoViewModel.cs
similarity index 85%
rename from Portal.CMS.Web/Areas/PageBuilder/ViewModels/Component/VideoViewModel.cs
rename to PortalCMS.Web/Areas/PageBuilder/ViewModels/Component/VideoViewModel.cs
index 0aeb762..d07d7ba 100644
--- a/Portal.CMS.Web/Areas/PageBuilder/ViewModels/Component/VideoViewModel.cs
+++ b/PortalCMS.Web/Areas/PageBuilder/ViewModels/Component/VideoViewModel.cs
@@ -1,7 +1,7 @@
 using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 
-namespace Portal.CMS.Web.Areas.PageBuilder.ViewModels.Component
+namespace PortalCMS.Web.Areas.PageBuilder.ViewModels.Component
 {
     public class VideoViewModel
     {
diff --git a/Portal.CMS.Web/Areas/PageBuilder/ViewModels/Section/AddViewModel.cs b/PortalCMS.Web/Areas/PageBuilder/ViewModels/Section/AddViewModel.cs
similarity index 77%
rename from Portal.CMS.Web/Areas/PageBuilder/ViewModels/Section/AddViewModel.cs
rename to PortalCMS.Web/Areas/PageBuilder/ViewModels/Section/AddViewModel.cs
index 0bf9f41..8ff6dd0 100644
--- a/Portal.CMS.Web/Areas/PageBuilder/ViewModels/Section/AddViewModel.cs
+++ b/PortalCMS.Web/Areas/PageBuilder/ViewModels/Section/AddViewModel.cs
@@ -1,7 +1,7 @@
-using Portal.CMS.Entities.Entities;
+using PortalCMS.Entities.Entities;
 using System.Collections.Generic;
 
-namespace Portal.CMS.Web.Areas.PageBuilder.ViewModels.Section
+namespace PortalCMS.Web.Areas.PageBuilder.ViewModels.Section
 {
     public class AddViewModel
     {
diff --git a/Portal.CMS.Web/Areas/PageBuilder/ViewModels/Section/CloneViewModel.cs b/PortalCMS.Web/Areas/PageBuilder/ViewModels/Section/CloneViewModel.cs
similarity index 83%
rename from Portal.CMS.Web/Areas/PageBuilder/ViewModels/Section/CloneViewModel.cs
rename to PortalCMS.Web/Areas/PageBuilder/ViewModels/Section/CloneViewModel.cs
index c7591a7..cbe7ded 100644
--- a/Portal.CMS.Web/Areas/PageBuilder/ViewModels/Section/CloneViewModel.cs
+++ b/PortalCMS.Web/Areas/PageBuilder/ViewModels/Section/CloneViewModel.cs
@@ -1,10 +1,10 @@
-using Portal.CMS.Entities.Entities;
+using PortalCMS.Entities.Entities;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
 using System.Web.Mvc;
 
-namespace Portal.CMS.Web.Areas.PageBuilder.ViewModels.Section
+namespace PortalCMS.Web.Areas.PageBuilder.ViewModels.Section
 {
     public class CloneViewModel
     {
diff --git a/Portal.CMS.Web/Areas/PageBuilder/ViewModels/Section/EditBackgroundColourViewModel.cs b/PortalCMS.Web/Areas/PageBuilder/ViewModels/Section/EditBackgroundColourViewModel.cs
similarity index 81%
rename from Portal.CMS.Web/Areas/PageBuilder/ViewModels/Section/EditBackgroundColourViewModel.cs
rename to PortalCMS.Web/Areas/PageBuilder/ViewModels/Section/EditBackgroundColourViewModel.cs
index 7e416f1..8b69db9 100644
--- a/Portal.CMS.Web/Areas/PageBuilder/ViewModels/Section/EditBackgroundColourViewModel.cs
+++ b/PortalCMS.Web/Areas/PageBuilder/ViewModels/Section/EditBackgroundColourViewModel.cs
@@ -1,6 +1,6 @@
 using System.ComponentModel;
 
-namespace Portal.CMS.Web.Areas.PageBuilder.ViewModels.Section
+namespace PortalCMS.Web.Areas.PageBuilder.ViewModels.Section
 {
     public class EditBackgroundColourViewModel
     {
diff --git a/Portal.CMS.Web/Areas/PageBuilder/ViewModels/Section/EditBackgroundImageViewModel.cs b/PortalCMS.Web/Areas/PageBuilder/ViewModels/Section/EditBackgroundImageViewModel.cs
similarity index 72%
rename from Portal.CMS.Web/Areas/PageBuilder/ViewModels/Section/EditBackgroundImageViewModel.cs
rename to PortalCMS.Web/Areas/PageBuilder/ViewModels/Section/EditBackgroundImageViewModel.cs
index 1e2f870..a86b443 100644
--- a/Portal.CMS.Web/Areas/PageBuilder/ViewModels/Section/EditBackgroundImageViewModel.cs
+++ b/PortalCMS.Web/Areas/PageBuilder/ViewModels/Section/EditBackgroundImageViewModel.cs
@@ -1,6 +1,6 @@
-using Portal.CMS.Web.ViewModels.Shared;
+using PortalCMS.Web.ViewModels.Shared;
 
-namespace Portal.CMS.Web.Areas.PageBuilder.ViewModels.Section
+namespace PortalCMS.Web.Areas.PageBuilder.ViewModels.Section
 {
     public class EditBackgroundImageViewModel
     {
diff --git a/Portal.CMS.Web/Areas/PageBuilder/ViewModels/Section/EditMarkupViewModel.cs b/PortalCMS.Web/Areas/PageBuilder/ViewModels/Section/EditMarkupViewModel.cs
similarity index 70%
rename from Portal.CMS.Web/Areas/PageBuilder/ViewModels/Section/EditMarkupViewModel.cs
rename to PortalCMS.Web/Areas/PageBuilder/ViewModels/Section/EditMarkupViewModel.cs
index cd0bacd..cd3a733 100644
--- a/Portal.CMS.Web/Areas/PageBuilder/ViewModels/Section/EditMarkupViewModel.cs
+++ b/PortalCMS.Web/Areas/PageBuilder/ViewModels/Section/EditMarkupViewModel.cs
@@ -1,4 +1,4 @@
-namespace Portal.CMS.Web.Areas.PageBuilder.ViewModels.Section
+namespace PortalCMS.Web.Areas.PageBuilder.ViewModels.Section
 {
     public class EditMarkupViewModel
     {
diff --git a/Portal.CMS.Web/Areas/PageBuilder/ViewModels/Section/RestoreViewModel.cs b/PortalCMS.Web/Areas/PageBuilder/ViewModels/Section/RestoreViewModel.cs
similarity index 66%
rename from Portal.CMS.Web/Areas/PageBuilder/ViewModels/Section/RestoreViewModel.cs
rename to PortalCMS.Web/Areas/PageBuilder/ViewModels/Section/RestoreViewModel.cs
index 86cd3c7..f030905 100644
--- a/Portal.CMS.Web/Areas/PageBuilder/ViewModels/Section/RestoreViewModel.cs
+++ b/PortalCMS.Web/Areas/PageBuilder/ViewModels/Section/RestoreViewModel.cs
@@ -1,7 +1,7 @@
-using Portal.CMS.Entities.Entities;
+using PortalCMS.Entities.Entities;
 using System.Collections.Generic;
 
-namespace Portal.CMS.Web.Areas.PageBuilder.ViewModels.Section
+namespace PortalCMS.Web.Areas.PageBuilder.ViewModels.Section
 {
     public class RestoreViewModel
     {
diff --git a/PortalCMS.Web/Areas/PageBuilder/ViewModels/Theme/ThemeViewModel.cs b/PortalCMS.Web/Areas/PageBuilder/ViewModels/Theme/ThemeViewModel.cs
new file mode 100644
index 0000000..9350d78
--- /dev/null
+++ b/PortalCMS.Web/Areas/PageBuilder/ViewModels/Theme/ThemeViewModel.cs
@@ -0,0 +1,9 @@
+using PortalCMS.Entities.Entities;
+
+namespace PortalCMS.Web.Areas.PageBuilder.ViewModels.Theme
+{
+    public class ThemeViewModel
+    {
+        public CustomTheme Theme { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/Portal.CMS.Web/Areas/PageBuilder/Views/Association/_Delete.cshtml b/PortalCMS.Web/Areas/PageBuilder/Views/Association/_Delete.cshtml
similarity index 100%
rename from Portal.CMS.Web/Areas/PageBuilder/Views/Association/_Delete.cshtml
rename to PortalCMS.Web/Areas/PageBuilder/Views/Association/_Delete.cshtml
diff --git a/Portal.CMS.Web/Areas/PageBuilder/Views/Association/_EditAccess.cshtml b/PortalCMS.Web/Areas/PageBuilder/Views/Association/_EditAccess.cshtml
similarity index 96%
rename from Portal.CMS.Web/Areas/PageBuilder/Views/Association/_EditAccess.cshtml
rename to PortalCMS.Web/Areas/PageBuilder/Views/Association/_EditAccess.cshtml
index 361b4a7..c28ef21 100644
--- a/Portal.CMS.Web/Areas/PageBuilder/Views/Association/_EditAccess.cshtml
+++ b/PortalCMS.Web/Areas/PageBuilder/Views/Association/_EditAccess.cshtml
@@ -1,4 +1,4 @@
-@model Portal.CMS.Web.Areas.PageBuilder.ViewModels.Association.EditAccessViewModel
+@model PortalCMS.Web.Areas.PageBuilder.ViewModels.Association.EditAccessViewModel
 @{
     Layout = "";
 }
diff --git a/Portal.CMS.Web/Areas/PageBuilder/Views/Component/_Add.cshtml b/PortalCMS.Web/Areas/PageBuilder/Views/Component/_Add.cshtml
similarity index 98%
rename from Portal.CMS.Web/Areas/PageBuilder/Views/Component/_Add.cshtml
rename to PortalCMS.Web/Areas/PageBuilder/Views/Component/_Add.cshtml
index a9d23e1..637624c 100644
--- a/Portal.CMS.Web/Areas/PageBuilder/Views/Component/_Add.cshtml
+++ b/PortalCMS.Web/Areas/PageBuilder/Views/Component/_Add.cshtml
@@ -1,4 +1,4 @@
-@model Portal.CMS.Web.Areas.PageBuilder.ViewModels.Component.AddViewModel
+@model PortalCMS.Web.Areas.PageBuilder.ViewModels.Component.AddViewModel
 @{
     Layout = "";
 }
diff --git a/Portal.CMS.Web/Areas/PageBuilder/Views/Component/_EditContainer.cshtml b/PortalCMS.Web/Areas/PageBuilder/Views/Component/_EditContainer.cshtml
similarity index 96%
rename from Portal.CMS.Web/Areas/PageBuilder/Views/Component/_EditContainer.cshtml
rename to PortalCMS.Web/Areas/PageBuilder/Views/Component/_EditContainer.cshtml
index f8e2983..d336cd6 100644
--- a/Portal.CMS.Web/Areas/PageBuilder/Views/Component/_EditContainer.cshtml
+++ b/PortalCMS.Web/Areas/PageBuilder/Views/Component/_EditContainer.cshtml
@@ -1,4 +1,4 @@
-@model Portal.CMS.Web.Areas.PageBuilder.ViewModels.Component.ContainerViewModel
+@model PortalCMS.Web.Areas.PageBuilder.ViewModels.Component.ContainerViewModel
 @{
     Layout = "";
 }
diff --git a/Portal.CMS.Web/Areas/PageBuilder/Views/Component/_EditImage.cshtml b/PortalCMS.Web/Areas/PageBuilder/Views/Component/_EditImage.cshtml
similarity index 98%
rename from Portal.CMS.Web/Areas/PageBuilder/Views/Component/_EditImage.cshtml
rename to PortalCMS.Web/Areas/PageBuilder/Views/Component/_EditImage.cshtml
index b099740..0a8bd65 100644
--- a/Portal.CMS.Web/Areas/PageBuilder/Views/Component/_EditImage.cshtml
+++ b/PortalCMS.Web/Areas/PageBuilder/Views/Component/_EditImage.cshtml
@@ -1,4 +1,4 @@
-@model Portal.CMS.Web.Areas.PageBuilder.ViewModels.Component.ImageViewModel
+@model PortalCMS.Web.Areas.PageBuilder.ViewModels.Component.ImageViewModel
 @{
     Layout = "";
 }
diff --git a/Portal.CMS.Web/Areas/PageBuilder/Views/Component/_EditVideo.cshtml b/PortalCMS.Web/Areas/PageBuilder/Views/Component/_EditVideo.cshtml
similarity index 96%
rename from Portal.CMS.Web/Areas/PageBuilder/Views/Component/_EditVideo.cshtml
rename to PortalCMS.Web/Areas/PageBuilder/Views/Component/_EditVideo.cshtml
index c1a57bd..e418cbf 100644
--- a/Portal.CMS.Web/Areas/PageBuilder/Views/Component/_EditVideo.cshtml
+++ b/PortalCMS.Web/Areas/PageBuilder/Views/Component/_EditVideo.cshtml
@@ -1,4 +1,4 @@
-@model Portal.CMS.Web.Areas.PageBuilder.ViewModels.Component.VideoViewModel
+@model PortalCMS.Web.Areas.PageBuilder.ViewModels.Component.VideoViewModel
 @{
     Layout = "";
 }
diff --git a/Portal.CMS.Web/Areas/PageBuilder/Views/Error/Index.cshtml b/PortalCMS.Web/Areas/PageBuilder/Views/Error/Index.cshtml
similarity index 93%
rename from Portal.CMS.Web/Areas/PageBuilder/Views/Error/Index.cshtml
rename to PortalCMS.Web/Areas/PageBuilder/Views/Error/Index.cshtml
index b6070f7..7db860c 100644
--- a/Portal.CMS.Web/Areas/PageBuilder/Views/Error/Index.cshtml
+++ b/PortalCMS.Web/Areas/PageBuilder/Views/Error/Index.cshtml
@@ -1,4 +1,4 @@
-@model Portal.CMS.Entities.Entities.Page
+@model PortalCMS.Entities.Entities.Page
 @{
     ViewBag.Title = "Server Error";
     Layout = "_Layout.cshtml";
diff --git a/Portal.CMS.Web/Areas/PageBuilder/Views/Error/NotFound.cshtml b/PortalCMS.Web/Areas/PageBuilder/Views/Error/NotFound.cshtml
similarity index 93%
rename from Portal.CMS.Web/Areas/PageBuilder/Views/Error/NotFound.cshtml
rename to PortalCMS.Web/Areas/PageBuilder/Views/Error/NotFound.cshtml
index 59011cd..ecff1ad 100644
--- a/Portal.CMS.Web/Areas/PageBuilder/Views/Error/NotFound.cshtml
+++ b/PortalCMS.Web/Areas/PageBuilder/Views/Error/NotFound.cshtml
@@ -1,4 +1,4 @@
-@model Portal.CMS.Entities.Entities.Page
+@model PortalCMS.Entities.Entities.Page
 @{
     ViewBag.Title = "Server Error";
     Layout = "_Layout.cshtml";
diff --git a/Portal.CMS.Web/Areas/PageBuilder/Views/Error/SignedOut.cshtml b/PortalCMS.Web/Areas/PageBuilder/Views/Error/SignedOut.cshtml
similarity index 100%
rename from Portal.CMS.Web/Areas/PageBuilder/Views/Error/SignedOut.cshtml
rename to PortalCMS.Web/Areas/PageBuilder/Views/Error/SignedOut.cshtml
diff --git a/Portal.CMS.Web/Areas/PageBuilder/Views/Error/_Layout.cshtml b/PortalCMS.Web/Areas/PageBuilder/Views/Error/_Layout.cshtml
similarity index 95%
rename from Portal.CMS.Web/Areas/PageBuilder/Views/Error/_Layout.cshtml
rename to PortalCMS.Web/Areas/PageBuilder/Views/Error/_Layout.cshtml
index 9f00679..b7eb1ae 100644
--- a/Portal.CMS.Web/Areas/PageBuilder/Views/Error/_Layout.cshtml
+++ b/PortalCMS.Web/Areas/PageBuilder/Views/Error/_Layout.cshtml
@@ -1,4 +1,4 @@
-@model Portal.CMS.Entities.Entities.Page
+@model PortalCMS.Entities.Entities.Page
 @{
     ViewBag.Title = "Error";
     Layout = "";
diff --git a/Portal.CMS.Web/Areas/PageBuilder/Views/Page/Editor.cshtml b/PortalCMS.Web/Areas/PageBuilder/Views/Page/Editor.cshtml
similarity index 97%
rename from Portal.CMS.Web/Areas/PageBuilder/Views/Page/Editor.cshtml
rename to PortalCMS.Web/Areas/PageBuilder/Views/Page/Editor.cshtml
index d8fb0a8..6379be7 100644
--- a/Portal.CMS.Web/Areas/PageBuilder/Views/Page/Editor.cshtml
+++ b/PortalCMS.Web/Areas/PageBuilder/Views/Page/Editor.cshtml
@@ -1,4 +1,4 @@
-@model Portal.CMS.Entities.Entities.Page
+@model PortalCMS.Entities.Entities.Page
 @{
     ViewBag.Title = Model.PageName;
 }
diff --git a/Portal.CMS.Web/Areas/PageBuilder/Views/Page/Guest.cshtml b/PortalCMS.Web/Areas/PageBuilder/Views/Page/Guest.cshtml
similarity index 79%
rename from Portal.CMS.Web/Areas/PageBuilder/Views/Page/Guest.cshtml
rename to PortalCMS.Web/Areas/PageBuilder/Views/Page/Guest.cshtml
index d42d576..fd93fbf 100644
--- a/Portal.CMS.Web/Areas/PageBuilder/Views/Page/Guest.cshtml
+++ b/PortalCMS.Web/Areas/PageBuilder/Views/Page/Guest.cshtml
@@ -1,5 +1,5 @@
 
-@model Portal.CMS.Entities.Entities.Page
+@model PortalCMS.Entities.Entities.Page
 @{
     ViewBag.Title = Model.PageName;
 }
diff --git a/Portal.CMS.Web/Areas/PageBuilder/Views/Page/_Page.cshtml b/PortalCMS.Web/Areas/PageBuilder/Views/Page/_Page.cshtml
similarity index 97%
rename from Portal.CMS.Web/Areas/PageBuilder/Views/Page/_Page.cshtml
rename to PortalCMS.Web/Areas/PageBuilder/Views/Page/_Page.cshtml
index 017c292..e5670b8 100644
--- a/Portal.CMS.Web/Areas/PageBuilder/Views/Page/_Page.cshtml
+++ b/PortalCMS.Web/Areas/PageBuilder/Views/Page/_Page.cshtml
@@ -1,4 +1,4 @@
-@model Portal.CMS.Entities.Entities.Page
+@model PortalCMS.Entities.Entities.Page
 @{
     Layout = "";
     var isAdmin = UserHelper.IsAdmin;
diff --git a/Portal.CMS.Web/Areas/PageBuilder/Views/Section/_Add.cshtml b/PortalCMS.Web/Areas/PageBuilder/Views/Section/_Add.cshtml
similarity index 99%
rename from Portal.CMS.Web/Areas/PageBuilder/Views/Section/_Add.cshtml
rename to PortalCMS.Web/Areas/PageBuilder/Views/Section/_Add.cshtml
index bf3b93b..ce20c88 100644
--- a/Portal.CMS.Web/Areas/PageBuilder/Views/Section/_Add.cshtml
+++ b/PortalCMS.Web/Areas/PageBuilder/Views/Section/_Add.cshtml
@@ -1,4 +1,4 @@
-@model Portal.CMS.Web.Areas.PageBuilder.ViewModels.Section.AddViewModel
+@model PortalCMS.Web.Areas.PageBuilder.ViewModels.Section.AddViewModel
 @{
     Layout = "";
 }
diff --git a/Portal.CMS.Web/Areas/PageBuilder/Views/Section/_Clone.cshtml b/PortalCMS.Web/Areas/PageBuilder/Views/Section/_Clone.cshtml
similarity index 96%
rename from Portal.CMS.Web/Areas/PageBuilder/Views/Section/_Clone.cshtml
rename to PortalCMS.Web/Areas/PageBuilder/Views/Section/_Clone.cshtml
index 5b1de6a..26a5673 100644
--- a/Portal.CMS.Web/Areas/PageBuilder/Views/Section/_Clone.cshtml
+++ b/PortalCMS.Web/Areas/PageBuilder/Views/Section/_Clone.cshtml
@@ -1,4 +1,4 @@
-@model Portal.CMS.Web.Areas.PageBuilder.ViewModels.Section.CloneViewModel
+@model PortalCMS.Web.Areas.PageBuilder.ViewModels.Section.CloneViewModel
 @{
     Layout = "";
 }
diff --git a/Portal.CMS.Web/Areas/PageBuilder/Views/Section/_EditBackgroundColour.cshtml b/PortalCMS.Web/Areas/PageBuilder/Views/Section/_EditBackgroundColour.cshtml
similarity index 96%
rename from Portal.CMS.Web/Areas/PageBuilder/Views/Section/_EditBackgroundColour.cshtml
rename to PortalCMS.Web/Areas/PageBuilder/Views/Section/_EditBackgroundColour.cshtml
index edf55de..e00c059 100644
--- a/Portal.CMS.Web/Areas/PageBuilder/Views/Section/_EditBackgroundColour.cshtml
+++ b/PortalCMS.Web/Areas/PageBuilder/Views/Section/_EditBackgroundColour.cshtml
@@ -1,4 +1,4 @@
-@model Portal.CMS.Web.Areas.PageBuilder.ViewModels.Section.EditBackgroundColourViewModel
+@model PortalCMS.Web.Areas.PageBuilder.ViewModels.Section.EditBackgroundColourViewModel
 @{
     Layout = "";
 }
diff --git a/Portal.CMS.Web/Areas/PageBuilder/Views/Section/_EditBackgroundImage.cshtml b/PortalCMS.Web/Areas/PageBuilder/Views/Section/_EditBackgroundImage.cshtml
similarity index 96%
rename from Portal.CMS.Web/Areas/PageBuilder/Views/Section/_EditBackgroundImage.cshtml
rename to PortalCMS.Web/Areas/PageBuilder/Views/Section/_EditBackgroundImage.cshtml
index 092764d..4702400 100644
--- a/Portal.CMS.Web/Areas/PageBuilder/Views/Section/_EditBackgroundImage.cshtml
+++ b/PortalCMS.Web/Areas/PageBuilder/Views/Section/_EditBackgroundImage.cshtml
@@ -1,4 +1,4 @@
-@model Portal.CMS.Web.Areas.PageBuilder.ViewModels.Section.EditBackgroundImageViewModel
+@model PortalCMS.Web.Areas.PageBuilder.ViewModels.Section.EditBackgroundImageViewModel
 @{
     Layout = "";
 }
diff --git a/Portal.CMS.Web/Areas/PageBuilder/Views/Section/_EditMarkup.cshtml b/PortalCMS.Web/Areas/PageBuilder/Views/Section/_EditMarkup.cshtml
similarity index 95%
rename from Portal.CMS.Web/Areas/PageBuilder/Views/Section/_EditMarkup.cshtml
rename to PortalCMS.Web/Areas/PageBuilder/Views/Section/_EditMarkup.cshtml
index dabcb1d..82d2dc7 100644
--- a/Portal.CMS.Web/Areas/PageBuilder/Views/Section/_EditMarkup.cshtml
+++ b/PortalCMS.Web/Areas/PageBuilder/Views/Section/_EditMarkup.cshtml
@@ -1,4 +1,4 @@
-@model Portal.CMS.Web.Areas.PageBuilder.ViewModels.Section.EditMarkupViewModel
+@model PortalCMS.Web.Areas.PageBuilder.ViewModels.Section.EditMarkupViewModel
 @{
     Layout = "";
     var textareaSelector = DateTime.Now.ToString("ddMMyyyyHHmmss");
diff --git a/Portal.CMS.Web/Areas/PageBuilder/Views/Section/_Restore.cshtml b/PortalCMS.Web/Areas/PageBuilder/Views/Section/_Restore.cshtml
similarity index 98%
rename from Portal.CMS.Web/Areas/PageBuilder/Views/Section/_Restore.cshtml
rename to PortalCMS.Web/Areas/PageBuilder/Views/Section/_Restore.cshtml
index 2c46058..8c5fc5b 100644
--- a/Portal.CMS.Web/Areas/PageBuilder/Views/Section/_Restore.cshtml
+++ b/PortalCMS.Web/Areas/PageBuilder/Views/Section/_Restore.cshtml
@@ -1,4 +1,4 @@
-@model Portal.CMS.Web.Areas.PageBuilder.ViewModels.Section.RestoreViewModel
+@model PortalCMS.Web.Areas.PageBuilder.ViewModels.Section.RestoreViewModel
 @{
     Layout = "";
 }
diff --git a/Portal.CMS.Web/Areas/PageBuilder/Views/Theme/Render.cscss b/PortalCMS.Web/Areas/PageBuilder/Views/Theme/Render.cscss
similarity index 92%
rename from Portal.CMS.Web/Areas/PageBuilder/Views/Theme/Render.cscss
rename to PortalCMS.Web/Areas/PageBuilder/Views/Theme/Render.cscss
index 0b79ab3..663d7b8 100644
--- a/Portal.CMS.Web/Areas/PageBuilder/Views/Theme/Render.cscss
+++ b/PortalCMS.Web/Areas/PageBuilder/Views/Theme/Render.cscss
@@ -1,5 +1,5 @@
-@model Portal.CMS.Web.Areas.PageBuilder.ViewModels.Theme.ThemeViewModel
-@using Portal.CMS.Web.Architecture.Extensions
+@model PortalCMS.Web.Areas.PageBuilder.ViewModels.Theme.ThemeViewModel
+@using PortalCMS.Web.Architecture.Extensions
 
 @@font-face { font-family: '@Model.Theme.TitleFont.FontName'; src: url('@Model.Theme.TitleFont.FontPath') format('@Model.Theme.TitleFont.FontType'); }
 
diff --git a/Portal.CMS.Web/Areas/PageBuilder/Views/_ViewStart.cshtml b/PortalCMS.Web/Areas/PageBuilder/Views/_ViewStart.cshtml
similarity index 100%
rename from Portal.CMS.Web/Areas/PageBuilder/Views/_ViewStart.cshtml
rename to PortalCMS.Web/Areas/PageBuilder/Views/_ViewStart.cshtml
diff --git a/PortalCMS.Web/Areas/PageBuilder/Views/web.config b/PortalCMS.Web/Areas/PageBuilder/Views/web.config
new file mode 100644
index 0000000..f218413
--- /dev/null
+++ b/PortalCMS.Web/Areas/PageBuilder/Views/web.config
@@ -0,0 +1,40 @@
+<?xml version="1.0"?>
+
+<configuration>
+  <configSections>
+    <sectionGroup name="system.web.webPages.razor" type="System.Web.WebPages.Razor.Configuration.RazorWebSectionGroup, System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
+      <section name="host" type="System.Web.WebPages.Razor.Configuration.HostSection, System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" />
+      <section name="pages" type="System.Web.WebPages.Razor.Configuration.RazorPagesSection, System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" />
+    </sectionGroup>
+  </configSections>
+
+  <system.web.webPages.razor>
+    <host factoryType="System.Web.Mvc.MvcWebRazorHostFactory, System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
+    <pages pageBaseType="System.Web.Mvc.WebViewPage">
+      <namespaces>
+        <add namespace="System.Web.Mvc" />
+        <add namespace="System.Web.Mvc.Ajax" />
+        <add namespace="System.Web.Mvc.Html" />
+        <add namespace="System.Web.Routing" />
+        <add namespace="System.Web.Optimization" />
+        <add namespace="PortalCMS.Web" />
+        <add namespace="PortalCMS.Web.Areas.Admin.ViewModels.Dashboard" />
+        <add namespace="PortalCMS.Entities.Enumerators" />
+        <add namespace="PortalCMS.Entities.Entities" />
+        <add namespace="PortalCMS.Web.Architecture.Helpers" />
+        <add namespace="PortalCMS.Web.Architecture.Extensions" />
+      </namespaces>
+    </pages>
+  </system.web.webPages.razor>
+
+  <appSettings>
+    <add key="webpages:Enabled" value="false" />
+  </appSettings>
+
+  <system.webServer>
+    <handlers>
+      <remove name="BlockViewHandler" />
+      <add name="BlockViewHandler" path="*" verb="*" preCondition="integratedMode" type="System.Web.HttpNotFoundHandler" />
+    </handlers>
+  </system.webServer>
+</configuration>
\ No newline at end of file
diff --git a/Portal.CMS.Web/Areas/Profile/Content/Images/admin-icon.png b/PortalCMS.Web/Areas/Profile/Content/Images/admin-icon.png
similarity index 100%
rename from Portal.CMS.Web/Areas/Profile/Content/Images/admin-icon.png
rename to PortalCMS.Web/Areas/Profile/Content/Images/admin-icon.png
diff --git a/Portal.CMS.Web/Areas/Profile/Content/Images/security-image.jpg b/PortalCMS.Web/Areas/Profile/Content/Images/security-image.jpg
similarity index 100%
rename from Portal.CMS.Web/Areas/Profile/Content/Images/security-image.jpg
rename to PortalCMS.Web/Areas/Profile/Content/Images/security-image.jpg
diff --git a/Portal.CMS.Web/Areas/Profile/Controllers/ManageController.cs b/PortalCMS.Web/Areas/Profile/Controllers/ManageController.cs
similarity index 77%
rename from Portal.CMS.Web/Areas/Profile/Controllers/ManageController.cs
rename to PortalCMS.Web/Areas/Profile/Controllers/ManageController.cs
index 567bc78..4aa8a7c 100644
--- a/Portal.CMS.Web/Areas/Profile/Controllers/ManageController.cs
+++ b/PortalCMS.Web/Areas/Profile/Controllers/ManageController.cs
@@ -1,14 +1,14 @@
-using Portal.CMS.Services.Authentication;
-using Portal.CMS.Web.Architecture.ActionFilters;
-using Portal.CMS.Web.Architecture.Helpers;
-using Portal.CMS.Web.Areas.Profile.ViewModels.Manage;
+using PortalCMS.Services.Authentication;
+using PortalCMS.Web.Architecture.ActionFilters;
+using PortalCMS.Web.Architecture.Helpers;
+using PortalCMS.Web.Areas.Profile.ViewModels.Manage;
 using System;
 using System.IO;
 using System.Threading.Tasks;
 using System.Web;
 using System.Web.Mvc;
 
-namespace Portal.CMS.Web.Areas.Profile.Controllers
+namespace PortalCMS.Web.Areas.Profile.Controllers
 {
     public class ManageController : Controller
     {
@@ -37,7 +37,7 @@ public ActionResult EditAccount()
         {
             var model = new AccountViewModel
             {
-                EmailAddress = UserHelper.EmailAddress,
+                EmailAddress = UserHelper.Email,
                 GivenName = UserHelper.GivenName,
                 FamilyName = UserHelper.FamilyName
             };
@@ -52,7 +52,7 @@ public async Task<ActionResult> EditAccount(AccountViewModel model)
             if (!ModelState.IsValid)
                 return View("_Account", model);
 
-            await _userService.UpdateDetailsAsync(UserHelper.UserId.Value, model.EmailAddress, model.GivenName, model.FamilyName);
+            await _userService.UpdateDetailsAsync(UserHelper.Id, model.EmailAddress, model.GivenName, model.FamilyName);
 
             await ResetUserSessionValueAsync();
 
@@ -74,9 +74,7 @@ public async Task<ActionResult> EditAvatar(AvatarViewModel model)
             if (!ModelState.IsValid)
                 return View("_Avatar", model);
 
-            var imageFilePath = SaveImage(model.AttachedImage, nameof(EditAvatar));
-
-            await _userService.UpdateAvatarAsync(UserHelper.UserId.Value, imageFilePath);
+            await _userService.UpdateAvatarAsync(UserHelper.Id, model.AttachedImage);
 
             await ResetUserSessionValueAsync();
 
@@ -98,7 +96,7 @@ public ActionResult EditBio()
         [ValidateAntiForgeryToken]
         public async Task<ActionResult> EditBio(BioViewModel model)
         {
-            await _userService.UpdateBioAsync(UserHelper.UserId.Value, model.Bio);
+            await _userService.UpdateBioAsync(UserHelper.Id, model.Bio);
 
             await ResetUserSessionValueAsync();
 
@@ -128,11 +126,8 @@ public async Task<ActionResult> EditPassword(PasswordViewModel model)
                 return View("_Password", model);
             }
 
-            await _registrationService.ChangePasswordAsync(UserHelper.UserId.Value, model.NewPassword);
-
-            var websiteAddress = $@"http://{System.Web.HttpContext.Current.Request.Url.Authority}";
-
-            await EmailHelper.SendEmailAsync(UserHelper.EmailAddress, "Account Notice", $"<p>Hello {UserHelper.FullName}</p><p>We just wanted to let you know that your password was changed at {websiteAddress}. If you didn't change your password, please let us know");
+            await _registrationService.ChangePasswordAsync(UserHelper.Id, model.NewPassword);
+            await EmailHelper.SendPasswordChangedAsync(UserHelper.Email, UserHelper.FullName);
 
             return Content("Refresh");
         }
@@ -149,7 +144,7 @@ private string SaveImage(HttpPostedFileBase imageFile, string actionName)
             if (!Directory.Exists(destinationDirectory))
                 Directory.CreateDirectory(destinationDirectory);
 
-            var imageFileName = $"media-{DateTime.Now.ToString("ddMMyyyyHHmmss")}-{UserHelper.UserId}-{imageFile.FileName}";
+            var imageFileName = $"media-{DateTime.Now.ToString("ddMMyyyyHHmmss")}-{UserHelper.Id}-{imageFile.FileName}";
             var path = Path.Combine(Server.MapPath(IMAGE_DIRECTORY), imageFileName);
 
             imageFile.SaveAs(path);
@@ -162,11 +157,11 @@ private string SaveImage(HttpPostedFileBase imageFile, string actionName)
 
         private async Task ResetUserSessionValueAsync()
         {
-            var userId = UserHelper.UserId;
+            var userId = UserHelper.Id;
 
             Session.Remove(USER_ACCOUNT);
 
-            Session.Add(USER_ACCOUNT, await _userService.GetUserAsync(userId.Value));
+            Session.Add(USER_ACCOUNT, await _userService.GetAsync(userId));
         }
     }
 }
\ No newline at end of file
diff --git a/Portal.CMS.Web/Areas/Profile/Controllers/WidgetsController.cs b/PortalCMS.Web/Areas/Profile/Controllers/WidgetsController.cs
similarity index 90%
rename from Portal.CMS.Web/Areas/Profile/Controllers/WidgetsController.cs
rename to PortalCMS.Web/Areas/Profile/Controllers/WidgetsController.cs
index ac77052..e06301e 100644
--- a/Portal.CMS.Web/Areas/Profile/Controllers/WidgetsController.cs
+++ b/PortalCMS.Web/Areas/Profile/Controllers/WidgetsController.cs
@@ -1,7 +1,7 @@
 using System.Web.Mvc;
 using System.Web.SessionState;
 
-namespace Portal.CMS.Web.Areas.Profile.Controllers
+namespace PortalCMS.Web.Areas.Profile.Controllers
 {
     [SessionState(SessionStateBehavior.ReadOnly)]
     public class WidgetsController : Controller
diff --git a/Portal.CMS.Web/Areas/Profile/ProfileAreaRegistration.cs b/PortalCMS.Web/Areas/Profile/ProfileAreaRegistration.cs
similarity index 93%
rename from Portal.CMS.Web/Areas/Profile/ProfileAreaRegistration.cs
rename to PortalCMS.Web/Areas/Profile/ProfileAreaRegistration.cs
index bef094c..bd7d88d 100644
--- a/Portal.CMS.Web/Areas/Profile/ProfileAreaRegistration.cs
+++ b/PortalCMS.Web/Areas/Profile/ProfileAreaRegistration.cs
@@ -1,6 +1,6 @@
 using System.Web.Mvc;
 
-namespace Portal.CMS.Web.Areas.Profile
+namespace PortalCMS.Web.Areas.Profile
 {
     public class ProfileAreaRegistration : AreaRegistration
     {
diff --git a/Portal.CMS.Web/Areas/Profile/ViewModels/Manage/AccountViewModel.cs b/PortalCMS.Web/Areas/Profile/ViewModels/Manage/AccountViewModel.cs
similarity index 88%
rename from Portal.CMS.Web/Areas/Profile/ViewModels/Manage/AccountViewModel.cs
rename to PortalCMS.Web/Areas/Profile/ViewModels/Manage/AccountViewModel.cs
index 1b37007..cd7fe85 100644
--- a/Portal.CMS.Web/Areas/Profile/ViewModels/Manage/AccountViewModel.cs
+++ b/PortalCMS.Web/Areas/Profile/ViewModels/Manage/AccountViewModel.cs
@@ -1,7 +1,7 @@
 using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 
-namespace Portal.CMS.Web.Areas.Profile.ViewModels.Manage
+namespace PortalCMS.Web.Areas.Profile.ViewModels.Manage
 {
     public class AccountViewModel
     {
diff --git a/PortalCMS.Web/Areas/Profile/ViewModels/Manage/AvatarViewModel.cs b/PortalCMS.Web/Areas/Profile/ViewModels/Manage/AvatarViewModel.cs
new file mode 100644
index 0000000..6c53ef0
--- /dev/null
+++ b/PortalCMS.Web/Areas/Profile/ViewModels/Manage/AvatarViewModel.cs
@@ -0,0 +1,13 @@
+using System.ComponentModel;
+using System.ComponentModel.DataAnnotations;
+using System.Web;
+
+namespace PortalCMS.Web.Areas.Profile.ViewModels.Manage
+{
+	public class AvatarViewModel
+	{
+		[Required]
+		[DisplayName("Avatar")]
+		public HttpPostedFileBase AttachedImage { get; set; }
+	}
+}
\ No newline at end of file
diff --git a/Portal.CMS.Web/Areas/Profile/ViewModels/Manage/BioViewModel.cs b/PortalCMS.Web/Areas/Profile/ViewModels/Manage/BioViewModel.cs
similarity index 72%
rename from Portal.CMS.Web/Areas/Profile/ViewModels/Manage/BioViewModel.cs
rename to PortalCMS.Web/Areas/Profile/ViewModels/Manage/BioViewModel.cs
index ca696f5..b3eec82 100644
--- a/Portal.CMS.Web/Areas/Profile/ViewModels/Manage/BioViewModel.cs
+++ b/PortalCMS.Web/Areas/Profile/ViewModels/Manage/BioViewModel.cs
@@ -1,6 +1,6 @@
 using System.ComponentModel;
 
-namespace Portal.CMS.Web.Areas.Profile.ViewModels.Manage
+namespace PortalCMS.Web.Areas.Profile.ViewModels.Manage
 {
     public class BioViewModel
     {
diff --git a/Portal.CMS.Web/Areas/Profile/ViewModels/Manage/PasswordViewModel.cs b/PortalCMS.Web/Areas/Profile/ViewModels/Manage/PasswordViewModel.cs
similarity index 85%
rename from Portal.CMS.Web/Areas/Profile/ViewModels/Manage/PasswordViewModel.cs
rename to PortalCMS.Web/Areas/Profile/ViewModels/Manage/PasswordViewModel.cs
index ffcec07..4d3dc30 100644
--- a/Portal.CMS.Web/Areas/Profile/ViewModels/Manage/PasswordViewModel.cs
+++ b/PortalCMS.Web/Areas/Profile/ViewModels/Manage/PasswordViewModel.cs
@@ -1,7 +1,7 @@
 using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 
-namespace Portal.CMS.Web.Areas.Profile.ViewModels.Manage
+namespace PortalCMS.Web.Areas.Profile.ViewModels.Manage
 {
     public class PasswordViewModel
     {
diff --git a/Portal.CMS.Web/Areas/Profile/Views/Manage/_Account.cshtml b/PortalCMS.Web/Areas/Profile/Views/Manage/_Account.cshtml
similarity index 93%
rename from Portal.CMS.Web/Areas/Profile/Views/Manage/_Account.cshtml
rename to PortalCMS.Web/Areas/Profile/Views/Manage/_Account.cshtml
index 10d6ca5..6f08f0e 100644
--- a/Portal.CMS.Web/Areas/Profile/Views/Manage/_Account.cshtml
+++ b/PortalCMS.Web/Areas/Profile/Views/Manage/_Account.cshtml
@@ -1,4 +1,4 @@
-@model Portal.CMS.Web.Areas.Profile.ViewModels.Manage.AccountViewModel
+@model PortalCMS.Web.Areas.Profile.ViewModels.Manage.AccountViewModel
 @{
     Layout = "";
 }
diff --git a/PortalCMS.Web/Areas/Profile/Views/Manage/_Avatar.cshtml b/PortalCMS.Web/Areas/Profile/Views/Manage/_Avatar.cshtml
new file mode 100644
index 0000000..58d025e
--- /dev/null
+++ b/PortalCMS.Web/Areas/Profile/Views/Manage/_Avatar.cshtml
@@ -0,0 +1,56 @@
+@model PortalCMS.Web.Areas.Profile.ViewModels.Manage.AvatarViewModel
+@{
+	Layout = "";
+}
+
+@using (Html.BeginForm("EditAvatar", "Manage", FormMethod.Post, new { id = "uploadImageForm", enctype = "multipart/form-data" }))
+{
+	@Html.AntiForgeryToken()
+
+	@Html.ValidationMessage("AttachedImage")
+	<style>
+		img.avatarUpload {
+			height: 130px;
+			width: 130px;
+			border-radius: 50%;
+			border: 1px solid gray;
+			display: block;
+			margin-left: auto;
+			margin-right: auto;
+			margin-bottom:20px;
+		}
+	</style>
+
+	<img class="avatarUpload" alt="User Avatar" src="data:image/jpeg;base64,@Convert.ToBase64String(UserHelper.AvatarImage)" />
+
+	<div class="control-group">
+		@Html.LabelFor(x => x.AttachedImage)
+		@Html.TextBoxFor(m => m.AttachedImage, new { @type = "file" })
+	</div>
+
+	<div class="footer">
+		<button class="btn primary">Upload Avatar</button>
+		<button class="btn" data-dismiss="modal">Cancel</button>
+	</div>
+}
+<script>
+	//What happens if the File changes?
+	$('#AttachedImage').change(function (event) {
+		var ext = this.value.match(/\.(.+)$/)[1];
+		switch (ext) {
+			case 'jpg':
+			case 'bmp':
+			case 'png':
+			case 'tif':
+				break;
+			default:
+				alert("The selected file does not appear to be an image.");
+				this.value = '';
+		}
+
+		var f = event.target.files[0];
+		var reader = new FileReader();
+		reader.onload = function (e) { $(".avatarUpload").attr('src', e.target.result); };
+		reader.readAsDataURL(f);
+	});
+</script>
\ No newline at end of file
diff --git a/Portal.CMS.Web/Areas/Profile/Views/Manage/_Bio.cshtml b/PortalCMS.Web/Areas/Profile/Views/Manage/_Bio.cshtml
similarity index 88%
rename from Portal.CMS.Web/Areas/Profile/Views/Manage/_Bio.cshtml
rename to PortalCMS.Web/Areas/Profile/Views/Manage/_Bio.cshtml
index 63d98c2..32c9bce 100644
--- a/Portal.CMS.Web/Areas/Profile/Views/Manage/_Bio.cshtml
+++ b/PortalCMS.Web/Areas/Profile/Views/Manage/_Bio.cshtml
@@ -1,4 +1,4 @@
-@model Portal.CMS.Web.Areas.Profile.ViewModels.Manage.BioViewModel
+@model PortalCMS.Web.Areas.Profile.ViewModels.Manage.BioViewModel
 @{
     Layout = "";
 }
diff --git a/Portal.CMS.Web/Areas/Profile/Views/Manage/_Password.cshtml b/PortalCMS.Web/Areas/Profile/Views/Manage/_Password.cshtml
similarity index 92%
rename from Portal.CMS.Web/Areas/Profile/Views/Manage/_Password.cshtml
rename to PortalCMS.Web/Areas/Profile/Views/Manage/_Password.cshtml
index 81fff08..44d916c 100644
--- a/Portal.CMS.Web/Areas/Profile/Views/Manage/_Password.cshtml
+++ b/PortalCMS.Web/Areas/Profile/Views/Manage/_Password.cshtml
@@ -1,4 +1,4 @@
-@model Portal.CMS.Web.Areas.Profile.ViewModels.Manage.PasswordViewModel
+@model PortalCMS.Web.Areas.Profile.ViewModels.Manage.PasswordViewModel
 @{
     Layout = "";
 }
diff --git a/Portal.CMS.Web/Areas/Profile/Views/Widgets/_BioWidget.cshtml b/PortalCMS.Web/Areas/Profile/Views/Widgets/_BioWidget.cshtml
similarity index 100%
rename from Portal.CMS.Web/Areas/Profile/Views/Widgets/_BioWidget.cshtml
rename to PortalCMS.Web/Areas/Profile/Views/Widgets/_BioWidget.cshtml
diff --git a/Portal.CMS.Web/Areas/Profile/Views/Widgets/_ProfileWidget.cshtml b/PortalCMS.Web/Areas/Profile/Views/Widgets/_ProfileWidget.cshtml
similarity index 84%
rename from Portal.CMS.Web/Areas/Profile/Views/Widgets/_ProfileWidget.cshtml
rename to PortalCMS.Web/Areas/Profile/Views/Widgets/_ProfileWidget.cshtml
index fd5bd06..3835875 100644
--- a/Portal.CMS.Web/Areas/Profile/Views/Widgets/_ProfileWidget.cshtml
+++ b/PortalCMS.Web/Areas/Profile/Views/Widgets/_ProfileWidget.cshtml
@@ -26,9 +26,9 @@
     <div class="box-title">My Profile</div>
     @if (UserHelper.IsLoggedIn)
     {
-        <img class="avatar" alt="My Avatar" src="@UserHelper.AvatarImagePath" style="margin-bottom: 10px;" />
+        <img class="avatar" alt="My Avatar" src="data:image/jpeg;base64,@Convert.ToBase64String(@UserHelper.AvatarImage)" style="margin-bottom: 10px;" />
         <h4>@UserHelper.FullName</h4>
-        <p>@UserHelper.EmailAddress</p>
+        <p>@UserHelper.Email</p>
 
         <div class="admin-container x2">
             <a href="@Url.Action("EditAvatar", "Manage", new { area = "Profile" })" c class="admin-item launch-modal" data-title="Edit Avatar"><span class="fa fa-picture-o"></span>Edit Avatar</a>
diff --git a/Portal.CMS.Web/Areas/Profile/Views/Widgets/_SecurityWidget.cshtml b/PortalCMS.Web/Areas/Profile/Views/Widgets/_SecurityWidget.cshtml
similarity index 100%
rename from Portal.CMS.Web/Areas/Profile/Views/Widgets/_SecurityWidget.cshtml
rename to PortalCMS.Web/Areas/Profile/Views/Widgets/_SecurityWidget.cshtml
diff --git a/Portal.CMS.Web/Areas/Profile/Views/Widgets/_SignIn.cshtml b/PortalCMS.Web/Areas/Profile/Views/Widgets/_SignIn.cshtml
similarity index 100%
rename from Portal.CMS.Web/Areas/Profile/Views/Widgets/_SignIn.cshtml
rename to PortalCMS.Web/Areas/Profile/Views/Widgets/_SignIn.cshtml
diff --git a/PortalCMS.Web/Areas/Profile/Views/web.config b/PortalCMS.Web/Areas/Profile/Views/web.config
new file mode 100644
index 0000000..7c3ff4b
--- /dev/null
+++ b/PortalCMS.Web/Areas/Profile/Views/web.config
@@ -0,0 +1,40 @@
+<?xml version="1.0"?>
+
+<configuration>
+  <configSections>
+    <sectionGroup name="system.web.webPages.razor" type="System.Web.WebPages.Razor.Configuration.RazorWebSectionGroup, System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
+      <section name="host" type="System.Web.WebPages.Razor.Configuration.HostSection, System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" />
+      <section name="pages" type="System.Web.WebPages.Razor.Configuration.RazorPagesSection, System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" />
+    </sectionGroup>
+  </configSections>
+
+  <system.web.webPages.razor>
+    <host factoryType="System.Web.Mvc.MvcWebRazorHostFactory, System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
+    <pages pageBaseType="System.Web.Mvc.WebViewPage">
+      <namespaces>
+        <add namespace="System.Web.Mvc" />
+        <add namespace="System.Web.Mvc.Ajax" />
+        <add namespace="System.Web.Mvc.Html" />
+        <add namespace="System.Web.Routing" />
+        <add namespace="System.Web.Optimization" />
+        <add namespace="PortalCMS.Web" />
+        <add namespace="PortalCMS.Web.Architecture.Helpers" />
+        <add namespace="PortalCMS.Web.Architecture.Extensions" />
+        <add namespace="PortalCMS.Web.Areas.Admin.ViewModels.Dashboard" />
+        <add namespace="PortalCMS.Entities.Enumerators" />
+        <add namespace="PortalCMS.Entities.Entities" />
+      </namespaces>
+    </pages>
+  </system.web.webPages.razor>
+
+  <appSettings>
+    <add key="webpages:Enabled" value="false" />
+  </appSettings>
+
+  <system.webServer>
+    <handlers>
+      <remove name="BlockViewHandler" />
+      <add name="BlockViewHandler" path="*" verb="*" preCondition="integratedMode" type="System.Web.HttpNotFoundHandler" />
+    </handlers>
+  </system.webServer>
+</configuration>
\ No newline at end of file
diff --git a/PortalCMS.Web/Areas/SignInController.cs b/PortalCMS.Web/Areas/SignInController.cs
new file mode 100644
index 0000000..6fe82ee
--- /dev/null
+++ b/PortalCMS.Web/Areas/SignInController.cs
@@ -0,0 +1,22 @@
+using System.Web;
+using Microsoft.AspNet.Identity.Owin;
+using PortalCMS.Entities.Entities.Models;
+
+namespace PortalCMS.Web.Controllers.Base
+{
+	public class SignInController : BaseController
+	{
+		private ApplicationSignInManager _signInManager;
+		public ApplicationSignInManager SignInManager
+		{
+			get
+			{
+				return _signInManager ?? HttpContext.GetOwinContext().Get<ApplicationSignInManager>();
+			}
+			set
+			{
+				_signInManager = value;
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/PortalCMS.Web/Content/EmailTemplates/AccountActivationLink.html b/PortalCMS.Web/Content/EmailTemplates/AccountActivationLink.html
new file mode 100644
index 0000000..fd5878c
--- /dev/null
+++ b/PortalCMS.Web/Content/EmailTemplates/AccountActivationLink.html
@@ -0,0 +1,32 @@
+<table border="0" cellpadding="0" cellspacing="0">
+  <tr>
+    <td>
+      <p>Welcome @Model.Name,</p>
+      <p>Thank you for registering with @Model.PortalName.</p>
+      <p>Your new account is almost ready, but before you can login you must activate your account:</p>
+      <p>Please click the button below to activate your account!</p>
+
+      <table border="0" cellpadding="0" cellspacing="0" class="btn btn-primary">
+        <tbody>
+          <tr>
+            <td align="left">
+              <table border="0" cellpadding="0" cellspacing="0">
+                <tbody>
+                  <tr>
+                    <td><a href="@Model.ActionLink">Activate Account</a></td>
+                  </tr>
+                </tbody>
+              </table>
+            </td>
+          </tr>
+        </tbody>
+      </table>
+
+      <br />
+      <p>Once you have activated your account you will be redirected to the login page.</p>
+      <p>If you did not register a new account you do not need to take any action.</p>
+      <p>Welcome aboard,</p>
+      <p>Administrator</p>
+    </td>
+  </tr>
+</table>
diff --git a/PortalCMS.Web/Content/EmailTemplates/Base/Base.html b/PortalCMS.Web/Content/EmailTemplates/Base/Base.html
new file mode 100644
index 0000000..b389224
--- /dev/null
+++ b/PortalCMS.Web/Content/EmailTemplates/Base/Base.html
@@ -0,0 +1,286 @@
+<!doctype html>
+<html>
+<head>
+  <meta name="viewport" content="width=device-width" />
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+  <title>@Model.PortalName</title>
+  <style>
+    /* -------------------------------------
+          GLOBAL RESETS
+      ------------------------------------- */
+    img {
+      border: none;
+      -ms-interpolation-mode: bicubic;
+      max-width: 100%;
+    }
+
+    body {
+      background-color: #f6f6f6;
+      font-family: sans-serif;
+      -webkit-font-smoothing: antialiased;
+      font-size: 14px;
+      line-height: 1.4;
+      margin: 0;
+      padding: 0;
+      -ms-text-size-adjust: 100%;
+      -webkit-text-size-adjust: 100%;
+    }
+
+    table {
+      border-collapse: separate;
+      mso-table-lspace: 0pt;
+      mso-table-rspace: 0pt;
+      width: 100%;
+    }
+
+      table td {
+        font-family: sans-serif;
+        font-size: 14px;
+        vertical-align: top;
+      }
+    /* -------------------------------------
+          BODY & CONTAINER
+      ------------------------------------- */
+    .body {
+      background-color: #f6f6f6;
+      width: 100%;
+    }
+    /* Set a max-width, and make it display as block so it will automatically stretch to that width, but will also shrink down on a phone or something */
+    .container {
+      display: block;
+      Margin: 0 auto !important;
+      /* makes it centered */
+      max-width: 580px;
+      padding: 10px;
+      width: 580px;
+    }
+    /* This should also be a block element, so that it will fill 100% of the .container */
+    .content {
+      box-sizing: border-box;
+      display: block;
+      Margin: 0 auto;
+      max-width: 580px;
+      padding: 10px;
+    }
+    /* -------------------------------------
+          HEADER, FOOTER, MAIN
+      ------------------------------------- */
+    .main {
+      background: #fff;
+      border-radius: 3px;
+      width: 100%;
+    }
+
+    .wrapper {
+      box-sizing: border-box;
+      padding: 20px;
+    }
+
+    .footer {
+      clear: both;
+      padding-top: 10px;
+      text-align: center;
+      width: 100%;
+    }
+
+      .footer td,
+      .footer p,
+      .footer span,
+      .footer a {
+        color: #999999;
+        font-size: 12px;
+        text-align: center;
+      }
+    /* -------------------------------------
+          TYPOGRAPHY
+      ------------------------------------- */
+    h1,
+    h2,
+    h3,
+    h4 {
+      color: #000000;
+      font-family: sans-serif;
+      font-weight: 400;
+      line-height: 1.4;
+      margin: 0;
+      Margin-bottom: 30px;
+    }
+
+    h1 {
+      font-size: 35px;
+      font-weight: 300;
+      text-align: center;
+      text-transform: capitalize;
+    }
+
+    p,
+    ul,
+    ol {
+      font-family: sans-serif;
+      font-size: 14px;
+      font-weight: normal;
+      margin: 0;
+      Margin-bottom: 15px;
+    }
+
+      p li,
+      ul li,
+      ol li {
+        list-style-position: inside;
+        margin-left: 5px;
+      }
+
+    a {
+      color: #3498db;
+      text-decoration: underline;
+    }
+    /* -------------------------------------
+          BUTTONS
+      ------------------------------------- */
+    .btn {
+      box-sizing: border-box;
+      width: 100%;
+    }
+
+      .btn > tbody > tr > td {
+        padding-bottom: 15px;
+      }
+
+      .btn table {
+        width: auto;
+      }
+
+        .btn table td {
+          background-color: #ffffff;
+          border-radius: 5px;
+          text-align: center;
+        }
+
+      .btn a {
+        background-color: #ffffff;
+        border: solid 1px #3498db;
+        border-radius: 5px;
+        box-sizing: border-box;
+        color: #3498db;
+        cursor: pointer;
+        display: inline-block;
+        font-size: 14px;
+        font-weight: bold;
+        margin: 0;
+        padding: 12px 25px;
+        text-decoration: none;
+        text-transform: capitalize;
+      }
+
+    .btn-primary table td {
+      background-color: #3498db;
+    }
+
+    .btn-primary a {
+      background-color: #3498db;
+      border-color: #3498db;
+      color: #ffffff;
+    }
+    /* -------------------------------------
+          OTHER STYLES THAT MIGHT BE USEFUL
+      ------------------------------------- */
+    .last {
+      margin-bottom: 0;
+    }
+
+    .first {
+      margin-top: 0;
+    }
+
+    .align-center {
+      text-align: center;
+    }
+
+    .align-right {
+      text-align: right;
+    }
+
+    .align-left {
+      text-align: left;
+    }
+
+    .clear {
+      clear: both;
+    }
+
+    .mt0 {
+      margin-top: 0;
+    }
+
+    .mb0 {
+      margin-bottom: 0;
+    }
+
+    .preheader {
+      color: black;
+			font-size:large;
+			font-weight:bold;
+			text-align:center;
+    }
+
+    .powered-by a {
+      text-decoration: none;
+    }
+
+    hr {
+      border: 0;
+      border-bottom: 1px solid #f6f6f6;
+      Margin: 20px 0;
+    }
+  </style>
+</head>
+<body class="">
+  <table border="0" cellpadding="0" cellspacing="0" class="body">
+    <tr>
+      <td>&nbsp;</td>
+      <td class="container">
+				<div class="content">
+					<img src=@Model.Logo style="height:70px; margin-top:80px;" />
+					<!-- START CENTERED WHITE CONTAINER -->
+					<div class="preheader">@Model.Title</div>
+					<table class="main">
+
+						<!-- START MAIN CONTENT AREA -->
+						<tr>
+							<td class="wrapper">
+
+								@Model.TemplateBody
+
+							</td>
+						</tr>
+
+						<!-- END MAIN CONTENT AREA -->
+					</table>
+
+					<!-- START FOOTER -->
+
+					<div class="footer">
+						<table border="0" cellpadding="0" cellspacing="0">
+							<tr>
+								<td class="content-block">
+									<span class="apple-link">@Model.PortalName</span>
+								</td>
+
+							</tr>
+							<tr>
+								<td class="content-block align-right">
+									<span class="apple-link">@Model.PortalAddress</span>
+								</td>
+							</tr>
+						</table>
+					</div>
+
+					<!-- END FOOTER -->
+					<!-- END CENTERED WHITE CONTAINER -->
+				</div>
+      </td>
+      <td>&nbsp;</td>
+    </tr>
+  </table>
+</body>
+</html>
\ No newline at end of file
diff --git a/PortalCMS.Web/Content/EmailTemplates/ContactUsMessage.html b/PortalCMS.Web/Content/EmailTemplates/ContactUsMessage.html
new file mode 100644
index 0000000..d7fd0f0
--- /dev/null
+++ b/PortalCMS.Web/Content/EmailTemplates/ContactUsMessage.html
@@ -0,0 +1,18 @@
+<table border="0" cellpadding="0" cellspacing="0">
+  <tr>
+		<td>
+			<p>FYI,</p>
+			<p>Hello, we thought you might like to know that a visitor to your website has submitted a message, here are the details we recorded</p>
+			
+			<br />
+			<p>Name: {Model.Name}</p>
+			<p>Email Address: {Model.FromEmailAddress}</p>
+			<p>Subject: {Model.Subject}</p>
+			<p>Message: {Model.Message}</p>");
+
+			<br />
+			<p>Kind regards,</p>
+			<p>Administrator</p>
+		</td>
+  </tr>
+</table>
diff --git a/PortalCMS.Web/Content/EmailTemplates/Default.html b/PortalCMS.Web/Content/EmailTemplates/Default.html
new file mode 100644
index 0000000..29aa993
--- /dev/null
+++ b/PortalCMS.Web/Content/EmailTemplates/Default.html
@@ -0,0 +1 @@
+<p>@Model.Body</p>
\ No newline at end of file
diff --git a/PortalCMS.Web/Content/EmailTemplates/PasswordChanged.html b/PortalCMS.Web/Content/EmailTemplates/PasswordChanged.html
new file mode 100644
index 0000000..cf6b701
--- /dev/null
+++ b/PortalCMS.Web/Content/EmailTemplates/PasswordChanged.html
@@ -0,0 +1,13 @@
+<table border="0" cellpadding="0" cellspacing="0">
+  <tr>
+		<td>
+			<p>Hi @Model.FullName,</p>
+			<p>Your password was changed at @Model.ChangeDate.</p>
+			<p>If you didn't change your password, please contact us immediately</p>
+			
+			<br />
+			<p>Kind regards,</p>
+			<p>Administrator</p>
+		</td>
+  </tr>
+</table>
diff --git a/PortalCMS.Web/Content/EmailTemplates/PasswordResetLink.html b/PortalCMS.Web/Content/EmailTemplates/PasswordResetLink.html
new file mode 100644
index 0000000..9224580
--- /dev/null
+++ b/PortalCMS.Web/Content/EmailTemplates/PasswordResetLink.html
@@ -0,0 +1,31 @@
+<table border="0" cellpadding="0" cellspacing="0">
+  <tr>
+    <td>
+      <p>Dear @Model.Name,</p>
+      <p>You have requested that your password to @Model.PortalName be reset</p>
+      <p>Please click the button below to reset your password!</p>
+
+      <table border="0" cellpadding="0" cellspacing="0" class="btn btn-primary">
+        <tbody>
+          <tr>
+            <td align="left">
+              <table border="0" cellpadding="0" cellspacing="0">
+                <tbody>
+                  <tr>
+                    <td><a href="@Model.ActionLink">Reset Password</a></td>
+                  </tr>
+                </tbody>
+              </table>
+            </td>
+          </tr>
+        </tbody>
+      </table>
+
+      <br />
+      <p>Once you have reset your password you will be redirected to the login page.</p>
+      <p>If you did not request a password reset you do not need to take any action.</p>
+      <p>Kind regards,</p>
+      <p>Administrator</p>
+    </td>
+  </tr>
+</table>
diff --git a/Portal.CMS.Web/Content/Fonts/AllerDisplay.ttf b/PortalCMS.Web/Content/Fonts/AllerDisplay.ttf
similarity index 100%
rename from Portal.CMS.Web/Content/Fonts/AllerDisplay.ttf
rename to PortalCMS.Web/Content/Fonts/AllerDisplay.ttf
diff --git a/Portal.CMS.Web/Content/Fonts/Anagram.ttf b/PortalCMS.Web/Content/Fonts/Anagram.ttf
similarity index 100%
rename from Portal.CMS.Web/Content/Fonts/Anagram.ttf
rename to PortalCMS.Web/Content/Fonts/Anagram.ttf
diff --git a/Portal.CMS.Web/Content/Fonts/ArchitectsDaughter.ttf b/PortalCMS.Web/Content/Fonts/ArchitectsDaughter.ttf
similarity index 100%
rename from Portal.CMS.Web/Content/Fonts/ArchitectsDaughter.ttf
rename to PortalCMS.Web/Content/Fonts/ArchitectsDaughter.ttf
diff --git a/Portal.CMS.Web/Content/Fonts/Blackout-2am.ttf b/PortalCMS.Web/Content/Fonts/Blackout-2am.ttf
similarity index 100%
rename from Portal.CMS.Web/Content/Fonts/Blackout-2am.ttf
rename to PortalCMS.Web/Content/Fonts/Blackout-2am.ttf
diff --git a/Portal.CMS.Web/Content/Fonts/BreeSerif-Regular.otf b/PortalCMS.Web/Content/Fonts/BreeSerif-Regular.otf
similarity index 100%
rename from Portal.CMS.Web/Content/Fonts/BreeSerif-Regular.otf
rename to PortalCMS.Web/Content/Fonts/BreeSerif-Regular.otf
diff --git a/Portal.CMS.Web/Content/Fonts/BubblegumSans-Regular.otf b/PortalCMS.Web/Content/Fonts/BubblegumSans-Regular.otf
similarity index 100%
rename from Portal.CMS.Web/Content/Fonts/BubblegumSans-Regular.otf
rename to PortalCMS.Web/Content/Fonts/BubblegumSans-Regular.otf
diff --git a/Portal.CMS.Web/Content/Fonts/DancingScript-Regular.otf b/PortalCMS.Web/Content/Fonts/DancingScript-Regular.otf
similarity index 100%
rename from Portal.CMS.Web/Content/Fonts/DancingScript-Regular.otf
rename to PortalCMS.Web/Content/Fonts/DancingScript-Regular.otf
diff --git a/Portal.CMS.Web/Content/Fonts/Emeric.ttf b/PortalCMS.Web/Content/Fonts/Emeric.ttf
similarity index 100%
rename from Portal.CMS.Web/Content/Fonts/Emeric.ttf
rename to PortalCMS.Web/Content/Fonts/Emeric.ttf
diff --git a/Portal.CMS.Web/Content/Fonts/GrandHotel-Regular.otf b/PortalCMS.Web/Content/Fonts/GrandHotel-Regular.otf
similarity index 100%
rename from Portal.CMS.Web/Content/Fonts/GrandHotel-Regular.otf
rename to PortalCMS.Web/Content/Fonts/GrandHotel-Regular.otf
diff --git a/Portal.CMS.Web/Content/Fonts/OpenSans-Regular.ttf b/PortalCMS.Web/Content/Fonts/OpenSans-Regular.ttf
similarity index 100%
rename from Portal.CMS.Web/Content/Fonts/OpenSans-Regular.ttf
rename to PortalCMS.Web/Content/Fonts/OpenSans-Regular.ttf
diff --git a/Portal.CMS.Web/Content/Fonts/Organo.ttf b/PortalCMS.Web/Content/Fonts/Organo.ttf
similarity index 100%
rename from Portal.CMS.Web/Content/Fonts/Organo.ttf
rename to PortalCMS.Web/Content/Fonts/Organo.ttf
diff --git a/Portal.CMS.Web/Content/Fonts/Railway.otf b/PortalCMS.Web/Content/Fonts/Railway.otf
similarity index 100%
rename from Portal.CMS.Web/Content/Fonts/Railway.otf
rename to PortalCMS.Web/Content/Fonts/Railway.otf
diff --git a/Portal.CMS.Web/Content/Fonts/Roboto-Bold.ttf b/PortalCMS.Web/Content/Fonts/Roboto-Bold.ttf
similarity index 100%
rename from Portal.CMS.Web/Content/Fonts/Roboto-Bold.ttf
rename to PortalCMS.Web/Content/Fonts/Roboto-Bold.ttf
diff --git a/Portal.CMS.Web/Content/Fonts/Roboto-Thin.ttf b/PortalCMS.Web/Content/Fonts/Roboto-Thin.ttf
similarity index 100%
rename from Portal.CMS.Web/Content/Fonts/Roboto-Thin.ttf
rename to PortalCMS.Web/Content/Fonts/Roboto-Thin.ttf
diff --git a/Portal.CMS.Web/Content/Fonts/Sniglet-Regular.otf b/PortalCMS.Web/Content/Fonts/Sniglet-Regular.otf
similarity index 100%
rename from Portal.CMS.Web/Content/Fonts/Sniglet-Regular.otf
rename to PortalCMS.Web/Content/Fonts/Sniglet-Regular.otf
diff --git a/Portal.CMS.Web/Content/Fonts/Thin_Line_Font.otf b/PortalCMS.Web/Content/Fonts/Thin_Line_Font.otf
similarity index 100%
rename from Portal.CMS.Web/Content/Fonts/Thin_Line_Font.otf
rename to PortalCMS.Web/Content/Fonts/Thin_Line_Font.otf
diff --git a/Portal.CMS.Web/Content/Fonts/carbontype.ttf b/PortalCMS.Web/Content/Fonts/carbontype.ttf
similarity index 100%
rename from Portal.CMS.Web/Content/Fonts/carbontype.ttf
rename to PortalCMS.Web/Content/Fonts/carbontype.ttf
diff --git a/Portal.CMS.Web/Content/Plugins/Animate/animate.min.css b/PortalCMS.Web/Content/Plugins/Animate/animate.min.css
similarity index 100%
rename from Portal.CMS.Web/Content/Plugins/Animate/animate.min.css
rename to PortalCMS.Web/Content/Plugins/Animate/animate.min.css
diff --git a/Portal.CMS.Web/Content/Plugins/Bootstrap/bootstrap.min.css b/PortalCMS.Web/Content/Plugins/Bootstrap/bootstrap.min.css
similarity index 100%
rename from Portal.CMS.Web/Content/Plugins/Bootstrap/bootstrap.min.css
rename to PortalCMS.Web/Content/Plugins/Bootstrap/bootstrap.min.css
diff --git a/Portal.CMS.Web/Content/Plugins/Bootstrap/bootstrap.min.js b/PortalCMS.Web/Content/Plugins/Bootstrap/bootstrap.min.js
similarity index 100%
rename from Portal.CMS.Web/Content/Plugins/Bootstrap/bootstrap.min.js
rename to PortalCMS.Web/Content/Plugins/Bootstrap/bootstrap.min.js
diff --git a/Portal.CMS.Web/Content/Plugins/C3Graphing/c3.min.css b/PortalCMS.Web/Content/Plugins/C3Graphing/c3.min.css
similarity index 100%
rename from Portal.CMS.Web/Content/Plugins/C3Graphing/c3.min.css
rename to PortalCMS.Web/Content/Plugins/C3Graphing/c3.min.css
diff --git a/Portal.CMS.Web/Content/Plugins/C3Graphing/c3.min.js b/PortalCMS.Web/Content/Plugins/C3Graphing/c3.min.js
similarity index 100%
rename from Portal.CMS.Web/Content/Plugins/C3Graphing/c3.min.js
rename to PortalCMS.Web/Content/Plugins/C3Graphing/c3.min.js
diff --git a/Portal.CMS.Web/Content/Plugins/C3Graphing/d3.min.js b/PortalCMS.Web/Content/Plugins/C3Graphing/d3.min.js
similarity index 100%
rename from Portal.CMS.Web/Content/Plugins/C3Graphing/d3.min.js
rename to PortalCMS.Web/Content/Plugins/C3Graphing/d3.min.js
diff --git a/Portal.CMS.Web/Content/Plugins/Confirmation/bootstrap-confirmation.min.js b/PortalCMS.Web/Content/Plugins/Confirmation/bootstrap-confirmation.min.js
similarity index 100%
rename from Portal.CMS.Web/Content/Plugins/Confirmation/bootstrap-confirmation.min.js
rename to PortalCMS.Web/Content/Plugins/Confirmation/bootstrap-confirmation.min.js
diff --git a/Portal.CMS.Web/Content/Plugins/FancyBox/blank.gif b/PortalCMS.Web/Content/Plugins/FancyBox/blank.gif
similarity index 100%
rename from Portal.CMS.Web/Content/Plugins/FancyBox/blank.gif
rename to PortalCMS.Web/Content/Plugins/FancyBox/blank.gif
diff --git a/Portal.CMS.Web/Content/Plugins/FancyBox/fancybox_loading.gif b/PortalCMS.Web/Content/Plugins/FancyBox/fancybox_loading.gif
similarity index 100%
rename from Portal.CMS.Web/Content/Plugins/FancyBox/fancybox_loading.gif
rename to PortalCMS.Web/Content/Plugins/FancyBox/fancybox_loading.gif
diff --git a/Portal.CMS.Web/Content/Plugins/FancyBox/fancybox_loading@2x.gif b/PortalCMS.Web/Content/Plugins/FancyBox/fancybox_loading@2x.gif
similarity index 100%
rename from Portal.CMS.Web/Content/Plugins/FancyBox/fancybox_loading@2x.gif
rename to PortalCMS.Web/Content/Plugins/FancyBox/fancybox_loading@2x.gif
diff --git a/Portal.CMS.Web/Content/Plugins/FancyBox/fancybox_overlay.png b/PortalCMS.Web/Content/Plugins/FancyBox/fancybox_overlay.png
similarity index 100%
rename from Portal.CMS.Web/Content/Plugins/FancyBox/fancybox_overlay.png
rename to PortalCMS.Web/Content/Plugins/FancyBox/fancybox_overlay.png
diff --git a/Portal.CMS.Web/Content/Plugins/FancyBox/fancybox_sprite.png b/PortalCMS.Web/Content/Plugins/FancyBox/fancybox_sprite.png
similarity index 100%
rename from Portal.CMS.Web/Content/Plugins/FancyBox/fancybox_sprite.png
rename to PortalCMS.Web/Content/Plugins/FancyBox/fancybox_sprite.png
diff --git a/Portal.CMS.Web/Content/Plugins/FancyBox/fancybox_sprite@2x.png b/PortalCMS.Web/Content/Plugins/FancyBox/fancybox_sprite@2x.png
similarity index 100%
rename from Portal.CMS.Web/Content/Plugins/FancyBox/fancybox_sprite@2x.png
rename to PortalCMS.Web/Content/Plugins/FancyBox/fancybox_sprite@2x.png
diff --git a/Portal.CMS.Web/Content/Plugins/FancyBox/initialise.js b/PortalCMS.Web/Content/Plugins/FancyBox/initialise.js
similarity index 100%
rename from Portal.CMS.Web/Content/Plugins/FancyBox/initialise.js
rename to PortalCMS.Web/Content/Plugins/FancyBox/initialise.js
diff --git a/Portal.CMS.Web/Content/Plugins/FancyBox/jquery.fancybox-thumbs.css b/PortalCMS.Web/Content/Plugins/FancyBox/jquery.fancybox-thumbs.css
similarity index 100%
rename from Portal.CMS.Web/Content/Plugins/FancyBox/jquery.fancybox-thumbs.css
rename to PortalCMS.Web/Content/Plugins/FancyBox/jquery.fancybox-thumbs.css
diff --git a/Portal.CMS.Web/Content/Plugins/FancyBox/jquery.fancybox-thumbs.js b/PortalCMS.Web/Content/Plugins/FancyBox/jquery.fancybox-thumbs.js
similarity index 100%
rename from Portal.CMS.Web/Content/Plugins/FancyBox/jquery.fancybox-thumbs.js
rename to PortalCMS.Web/Content/Plugins/FancyBox/jquery.fancybox-thumbs.js
diff --git a/Portal.CMS.Web/Content/Plugins/FancyBox/jquery.fancybox.css b/PortalCMS.Web/Content/Plugins/FancyBox/jquery.fancybox.css
similarity index 100%
rename from Portal.CMS.Web/Content/Plugins/FancyBox/jquery.fancybox.css
rename to PortalCMS.Web/Content/Plugins/FancyBox/jquery.fancybox.css
diff --git a/Portal.CMS.Web/Content/Plugins/FancyBox/jquery.fancybox.js b/PortalCMS.Web/Content/Plugins/FancyBox/jquery.fancybox.js
similarity index 100%
rename from Portal.CMS.Web/Content/Plugins/FancyBox/jquery.fancybox.js
rename to PortalCMS.Web/Content/Plugins/FancyBox/jquery.fancybox.js
diff --git a/Portal.CMS.Web/Content/Plugins/FontAwesome/FontAwesome.otf b/PortalCMS.Web/Content/Plugins/FontAwesome/FontAwesome.otf
similarity index 100%
rename from Portal.CMS.Web/Content/Plugins/FontAwesome/FontAwesome.otf
rename to PortalCMS.Web/Content/Plugins/FontAwesome/FontAwesome.otf
diff --git a/Portal.CMS.Web/Content/Plugins/FontAwesome/font-awesome.min.css b/PortalCMS.Web/Content/Plugins/FontAwesome/font-awesome.min.css
similarity index 100%
rename from Portal.CMS.Web/Content/Plugins/FontAwesome/font-awesome.min.css
rename to PortalCMS.Web/Content/Plugins/FontAwesome/font-awesome.min.css
diff --git a/Portal.CMS.Web/Content/Plugins/FontAwesome/fontawesome-iconpicker.min.css b/PortalCMS.Web/Content/Plugins/FontAwesome/fontawesome-iconpicker.min.css
similarity index 100%
rename from Portal.CMS.Web/Content/Plugins/FontAwesome/fontawesome-iconpicker.min.css
rename to PortalCMS.Web/Content/Plugins/FontAwesome/fontawesome-iconpicker.min.css
diff --git a/Portal.CMS.Web/Content/Plugins/FontAwesome/fontawesome-iconpicker.min.js b/PortalCMS.Web/Content/Plugins/FontAwesome/fontawesome-iconpicker.min.js
similarity index 100%
rename from Portal.CMS.Web/Content/Plugins/FontAwesome/fontawesome-iconpicker.min.js
rename to PortalCMS.Web/Content/Plugins/FontAwesome/fontawesome-iconpicker.min.js
diff --git a/Portal.CMS.Web/Content/Plugins/FontAwesome/fontawesome-webfont.eot b/PortalCMS.Web/Content/Plugins/FontAwesome/fontawesome-webfont.eot
similarity index 100%
rename from Portal.CMS.Web/Content/Plugins/FontAwesome/fontawesome-webfont.eot
rename to PortalCMS.Web/Content/Plugins/FontAwesome/fontawesome-webfont.eot
diff --git a/Portal.CMS.Web/Content/Plugins/FontAwesome/fontawesome-webfont.svg b/PortalCMS.Web/Content/Plugins/FontAwesome/fontawesome-webfont.svg
similarity index 100%
rename from Portal.CMS.Web/Content/Plugins/FontAwesome/fontawesome-webfont.svg
rename to PortalCMS.Web/Content/Plugins/FontAwesome/fontawesome-webfont.svg
diff --git a/Portal.CMS.Web/Content/Plugins/FontAwesome/fontawesome-webfont.ttf b/PortalCMS.Web/Content/Plugins/FontAwesome/fontawesome-webfont.ttf
similarity index 100%
rename from Portal.CMS.Web/Content/Plugins/FontAwesome/fontawesome-webfont.ttf
rename to PortalCMS.Web/Content/Plugins/FontAwesome/fontawesome-webfont.ttf
diff --git a/Portal.CMS.Web/Content/Plugins/FontAwesome/fontawesome-webfont.woff b/PortalCMS.Web/Content/Plugins/FontAwesome/fontawesome-webfont.woff
similarity index 100%
rename from Portal.CMS.Web/Content/Plugins/FontAwesome/fontawesome-webfont.woff
rename to PortalCMS.Web/Content/Plugins/FontAwesome/fontawesome-webfont.woff
diff --git a/Portal.CMS.Web/Content/Plugins/FontAwesome/fontawesome-webfont.woff2 b/PortalCMS.Web/Content/Plugins/FontAwesome/fontawesome-webfont.woff2
similarity index 100%
rename from Portal.CMS.Web/Content/Plugins/FontAwesome/fontawesome-webfont.woff2
rename to PortalCMS.Web/Content/Plugins/FontAwesome/fontawesome-webfont.woff2
diff --git a/Portal.CMS.Web/Content/Plugins/HoverCSS/hover-min.css b/PortalCMS.Web/Content/Plugins/HoverCSS/hover-min.css
similarity index 100%
rename from Portal.CMS.Web/Content/Plugins/HoverCSS/hover-min.css
rename to PortalCMS.Web/Content/Plugins/HoverCSS/hover-min.css
diff --git a/Portal.CMS.Web/Content/Plugins/ImageSelector/imageselector.js b/PortalCMS.Web/Content/Plugins/ImageSelector/imageselector.js
similarity index 100%
rename from Portal.CMS.Web/Content/Plugins/ImageSelector/imageselector.js
rename to PortalCMS.Web/Content/Plugins/ImageSelector/imageselector.js
diff --git a/Portal.CMS.Web/Content/Plugins/JQuery/jquery-2.2.1.min.js b/PortalCMS.Web/Content/Plugins/JQuery/jquery-2.2.1.min.js
similarity index 100%
rename from Portal.CMS.Web/Content/Plugins/JQuery/jquery-2.2.1.min.js
rename to PortalCMS.Web/Content/Plugins/JQuery/jquery-2.2.1.min.js
diff --git a/Portal.CMS.Web/Content/Plugins/JQueryUI/jquery-ui.min.css b/PortalCMS.Web/Content/Plugins/JQueryUI/jquery-ui.min.css
similarity index 100%
rename from Portal.CMS.Web/Content/Plugins/JQueryUI/jquery-ui.min.css
rename to PortalCMS.Web/Content/Plugins/JQueryUI/jquery-ui.min.css
diff --git a/Portal.CMS.Web/Content/Plugins/JQueryUI/jquery-ui.min.js b/PortalCMS.Web/Content/Plugins/JQueryUI/jquery-ui.min.js
similarity index 100%
rename from Portal.CMS.Web/Content/Plugins/JQueryUI/jquery-ui.min.js
rename to PortalCMS.Web/Content/Plugins/JQueryUI/jquery-ui.min.js
diff --git a/Portal.CMS.Web/Content/Plugins/JQueryUI/jquery.ui.touch-punch.min.js b/PortalCMS.Web/Content/Plugins/JQueryUI/jquery.ui.touch-punch.min.js
similarity index 100%
rename from Portal.CMS.Web/Content/Plugins/JQueryUI/jquery.ui.touch-punch.min.js
rename to PortalCMS.Web/Content/Plugins/JQueryUI/jquery.ui.touch-punch.min.js
diff --git a/Portal.CMS.Web/Content/Plugins/Spectrum/initialise.js b/PortalCMS.Web/Content/Plugins/Spectrum/initialise.js
similarity index 100%
rename from Portal.CMS.Web/Content/Plugins/Spectrum/initialise.js
rename to PortalCMS.Web/Content/Plugins/Spectrum/initialise.js
diff --git a/Portal.CMS.Web/Content/Plugins/Spectrum/spectrum.css b/PortalCMS.Web/Content/Plugins/Spectrum/spectrum.css
similarity index 100%
rename from Portal.CMS.Web/Content/Plugins/Spectrum/spectrum.css
rename to PortalCMS.Web/Content/Plugins/Spectrum/spectrum.css
diff --git a/Portal.CMS.Web/Content/Plugins/Spectrum/spectrum.min.js b/PortalCMS.Web/Content/Plugins/Spectrum/spectrum.min.js
similarity index 100%
rename from Portal.CMS.Web/Content/Plugins/Spectrum/spectrum.min.js
rename to PortalCMS.Web/Content/Plugins/Spectrum/spectrum.min.js
diff --git a/Portal.CMS.Web/Content/Scripts/Administration/MenuBuilder-Admin.js b/PortalCMS.Web/Content/Scripts/Administration/MenuBuilder-Admin.js
similarity index 100%
rename from Portal.CMS.Web/Content/Scripts/Administration/MenuBuilder-Admin.js
rename to PortalCMS.Web/Content/Scripts/Administration/MenuBuilder-Admin.js
diff --git a/Portal.CMS.Web/Content/Scripts/Administration/PageBuilder-Admin.js b/PortalCMS.Web/Content/Scripts/Administration/PageBuilder-Admin.js
similarity index 100%
rename from Portal.CMS.Web/Content/Scripts/Administration/PageBuilder-Admin.js
rename to PortalCMS.Web/Content/Scripts/Administration/PageBuilder-Admin.js
diff --git a/Portal.CMS.Web/Content/Scripts/Administration/ThemeManager-Admin.js b/PortalCMS.Web/Content/Scripts/Administration/ThemeManager-Admin.js
similarity index 100%
rename from Portal.CMS.Web/Content/Scripts/Administration/ThemeManager-Admin.js
rename to PortalCMS.Web/Content/Scripts/Administration/ThemeManager-Admin.js
diff --git a/Portal.CMS.Web/Content/Scripts/Components/component.expand.js b/PortalCMS.Web/Content/Scripts/Components/component.expand.js
similarity index 100%
rename from Portal.CMS.Web/Content/Scripts/Components/component.expand.js
rename to PortalCMS.Web/Content/Scripts/Components/component.expand.js
diff --git a/Portal.CMS.Web/Content/Scripts/EditablePopover/editable.popover.js b/PortalCMS.Web/Content/Scripts/EditablePopover/editable.popover.js
similarity index 100%
rename from Portal.CMS.Web/Content/Scripts/EditablePopover/editable.popover.js
rename to PortalCMS.Web/Content/Scripts/EditablePopover/editable.popover.js
diff --git a/Portal.CMS.Web/Content/Scripts/Editor/QuickAccess.js b/PortalCMS.Web/Content/Scripts/Editor/QuickAccess.js
similarity index 100%
rename from Portal.CMS.Web/Content/Scripts/Editor/QuickAccess.js
rename to PortalCMS.Web/Content/Scripts/Editor/QuickAccess.js
diff --git a/Portal.CMS.Web/Content/Scripts/Framework/PageBuilder-Anonymous.JS b/PortalCMS.Web/Content/Scripts/Framework/PageBuilder-Anonymous.JS
similarity index 100%
rename from Portal.CMS.Web/Content/Scripts/Framework/PageBuilder-Anonymous.JS
rename to PortalCMS.Web/Content/Scripts/Framework/PageBuilder-Anonymous.JS
diff --git a/Portal.CMS.Web/Content/Scripts/Framework/framework.js b/PortalCMS.Web/Content/Scripts/Framework/framework.js
similarity index 100%
rename from Portal.CMS.Web/Content/Scripts/Framework/framework.js
rename to PortalCMS.Web/Content/Scripts/Framework/framework.js
diff --git a/Portal.CMS.Web/Content/Scripts/Framework/pagination.js b/PortalCMS.Web/Content/Scripts/Framework/pagination.js
similarity index 100%
rename from Portal.CMS.Web/Content/Scripts/Framework/pagination.js
rename to PortalCMS.Web/Content/Scripts/Framework/pagination.js
diff --git a/Portal.CMS.Web/Content/Scripts/Popover/initialise.js b/PortalCMS.Web/Content/Scripts/Popover/initialise.js
similarity index 100%
rename from Portal.CMS.Web/Content/Scripts/Popover/initialise.js
rename to PortalCMS.Web/Content/Scripts/Popover/initialise.js
diff --git a/Portal.CMS.Web/Content/Styles/Administration/action-container.css b/PortalCMS.Web/Content/Styles/Administration/action-container.css
similarity index 100%
rename from Portal.CMS.Web/Content/Styles/Administration/action-container.css
rename to PortalCMS.Web/Content/Styles/Administration/action-container.css
diff --git a/Portal.CMS.Web/Content/Styles/Administration/administration-panel.css b/PortalCMS.Web/Content/Styles/Administration/administration-panel.css
similarity index 100%
rename from Portal.CMS.Web/Content/Styles/Administration/administration-panel.css
rename to PortalCMS.Web/Content/Styles/Administration/administration-panel.css
diff --git a/Portal.CMS.Web/Content/Styles/AppDrawers/app-drawers.css b/PortalCMS.Web/Content/Styles/AppDrawers/app-drawers.css
similarity index 100%
rename from Portal.CMS.Web/Content/Styles/AppDrawers/app-drawers.css
rename to PortalCMS.Web/Content/Styles/AppDrawers/app-drawers.css
diff --git a/Portal.CMS.Web/Content/Styles/Framework/framework-boxes.css b/PortalCMS.Web/Content/Styles/Framework/framework-boxes.css
similarity index 100%
rename from Portal.CMS.Web/Content/Styles/Framework/framework-boxes.css
rename to PortalCMS.Web/Content/Styles/Framework/framework-boxes.css
diff --git a/Portal.CMS.Web/Content/Styles/Framework/framework-buttons.css b/PortalCMS.Web/Content/Styles/Framework/framework-buttons.css
similarity index 100%
rename from Portal.CMS.Web/Content/Styles/Framework/framework-buttons.css
rename to PortalCMS.Web/Content/Styles/Framework/framework-buttons.css
diff --git a/Portal.CMS.Web/Content/Styles/Framework/framework-console.css b/PortalCMS.Web/Content/Styles/Framework/framework-console.css
similarity index 100%
rename from Portal.CMS.Web/Content/Styles/Framework/framework-console.css
rename to PortalCMS.Web/Content/Styles/Framework/framework-console.css
diff --git a/Portal.CMS.Web/Content/Styles/Framework/framework-editable-popover.css b/PortalCMS.Web/Content/Styles/Framework/framework-editable-popover.css
similarity index 100%
rename from Portal.CMS.Web/Content/Styles/Framework/framework-editable-popover.css
rename to PortalCMS.Web/Content/Styles/Framework/framework-editable-popover.css
diff --git a/Portal.CMS.Web/Content/Styles/Framework/framework-fields.css b/PortalCMS.Web/Content/Styles/Framework/framework-fields.css
similarity index 61%
rename from Portal.CMS.Web/Content/Styles/Framework/framework-fields.css
rename to PortalCMS.Web/Content/Styles/Framework/framework-fields.css
index d08be70..70b0361 100644
--- a/Portal.CMS.Web/Content/Styles/Framework/framework-fields.css
+++ b/PortalCMS.Web/Content/Styles/Framework/framework-fields.css
@@ -58,6 +58,76 @@
         width: calc(100% - 200px);
     }
 
+/* The container */
+.control-checkbox-group {
+	display: block;
+	position: relative;
+	padding-left: 35px;
+	margin-bottom: 12px;
+	cursor: pointer;
+	font-size: 14px;
+	-webkit-user-select: none;
+	-moz-user-select: none;
+	-ms-user-select: none;
+	user-select: none;
+}
+
+	.control-checkbox-group label {
+		padding-top: 4px;
+		cursor: pointer;
+	}
+
+	.control-checkbox-group input {
+		position: absolute;
+		opacity: 0;
+		cursor: pointer;
+		height: 0;
+		width: 0;
+	}
+
+/* Create a custom checkbox */
+.checkmark {
+	position: absolute;
+	top: 0;
+	left: 0;
+	height: 25px;
+	width: 25px;
+	background-color: #eee;
+	border-radius: 4px;
+	border: 1px solid #ccc;
+}
+
+/* When the checkbox is checked, add a colored background */
+.control-checkbox-group input:checked ~ .checkmark {
+	background-color: #337ab7;
+}
+
+/* Create the checkmark/indicator (hidden when not checked) */
+.checkmark:after {
+	content: "";
+	position: absolute;
+	display: none;
+}
+
+/* Show the checkmark when checked */
+.control-checkbox-group input:checked ~ .checkmark:after {
+	display: block;
+}
+
+/* Style the checkmark/indicator */
+.control-checkbox-group .checkmark:after {
+	left: 9px;
+	top: 5px;
+	width: 5px;
+	height: 10px;
+	border: solid white;
+	border-width: 0 3px 3px 0;
+	-webkit-transform: rotate(45deg);
+	-ms-transform: rotate(45deg);
+	transform: rotate(45deg);
+}
+/* end of checkboxes */
+
 .jquery-slider-wrapper
 {
     width: calc(100% - 300px);
diff --git a/Portal.CMS.Web/Content/Styles/Framework/framework-helpers.css b/PortalCMS.Web/Content/Styles/Framework/framework-helpers.css
similarity index 100%
rename from Portal.CMS.Web/Content/Styles/Framework/framework-helpers.css
rename to PortalCMS.Web/Content/Styles/Framework/framework-helpers.css
diff --git a/Portal.CMS.Web/Content/Styles/Framework/framework-images.css b/PortalCMS.Web/Content/Styles/Framework/framework-images.css
similarity index 100%
rename from Portal.CMS.Web/Content/Styles/Framework/framework-images.css
rename to PortalCMS.Web/Content/Styles/Framework/framework-images.css
diff --git a/Portal.CMS.Web/Content/Styles/Framework/framework-nav.css b/PortalCMS.Web/Content/Styles/Framework/framework-nav.css
similarity index 88%
rename from Portal.CMS.Web/Content/Styles/Framework/framework-nav.css
rename to PortalCMS.Web/Content/Styles/Framework/framework-nav.css
index 3599daf..5825d0d 100644
--- a/Portal.CMS.Web/Content/Styles/Framework/framework-nav.css
+++ b/PortalCMS.Web/Content/Styles/Framework/framework-nav.css
@@ -64,4 +64,13 @@
     {
         padding: inherit;
     }
+}
+
+.navbar-profileImage {
+	width: 22px;
+	height: 22px;
+	border-radius: 50%;
+	border: solid 1px gray;
+	margin: 0;
+	padding: 0;
 }
\ No newline at end of file
diff --git a/Portal.CMS.Web/Content/Styles/Framework/framework-override.css b/PortalCMS.Web/Content/Styles/Framework/framework-override.css
similarity index 100%
rename from Portal.CMS.Web/Content/Styles/Framework/framework-override.css
rename to PortalCMS.Web/Content/Styles/Framework/framework-override.css
diff --git a/Portal.CMS.Web/Content/Styles/Framework/framework-posts.css b/PortalCMS.Web/Content/Styles/Framework/framework-posts.css
similarity index 100%
rename from Portal.CMS.Web/Content/Styles/Framework/framework-posts.css
rename to PortalCMS.Web/Content/Styles/Framework/framework-posts.css
diff --git a/Portal.CMS.Web/Content/Styles/Framework/framework-spinners.css b/PortalCMS.Web/Content/Styles/Framework/framework-spinners.css
similarity index 100%
rename from Portal.CMS.Web/Content/Styles/Framework/framework-spinners.css
rename to PortalCMS.Web/Content/Styles/Framework/framework-spinners.css
diff --git a/Portal.CMS.Web/Content/Styles/Framework/framework-tables.css b/PortalCMS.Web/Content/Styles/Framework/framework-tables.css
similarity index 100%
rename from Portal.CMS.Web/Content/Styles/Framework/framework-tables.css
rename to PortalCMS.Web/Content/Styles/Framework/framework-tables.css
diff --git a/Portal.CMS.Web/Content/Styles/Framework/framework-text.css b/PortalCMS.Web/Content/Styles/Framework/framework-text.css
similarity index 100%
rename from Portal.CMS.Web/Content/Styles/Framework/framework-text.css
rename to PortalCMS.Web/Content/Styles/Framework/framework-text.css
diff --git a/Portal.CMS.Web/Content/Styles/Framework/framework.css b/PortalCMS.Web/Content/Styles/Framework/framework.css
similarity index 100%
rename from Portal.CMS.Web/Content/Styles/Framework/framework.css
rename to PortalCMS.Web/Content/Styles/Framework/framework.css
diff --git a/Portal.CMS.Web/Content/Styles/Framework/pagebuilder-components.css b/PortalCMS.Web/Content/Styles/Framework/pagebuilder-components.css
similarity index 100%
rename from Portal.CMS.Web/Content/Styles/Framework/pagebuilder-components.css
rename to PortalCMS.Web/Content/Styles/Framework/pagebuilder-components.css
diff --git a/Portal.CMS.Web/Content/Styles/Framework/pagebuilder-sections.css b/PortalCMS.Web/Content/Styles/Framework/pagebuilder-sections.css
similarity index 100%
rename from Portal.CMS.Web/Content/Styles/Framework/pagebuilder-sections.css
rename to PortalCMS.Web/Content/Styles/Framework/pagebuilder-sections.css
diff --git a/Portal.CMS.Web/Content/Styles/Framework/pagebuilder.css b/PortalCMS.Web/Content/Styles/Framework/pagebuilder.css
similarity index 100%
rename from Portal.CMS.Web/Content/Styles/Framework/pagebuilder.css
rename to PortalCMS.Web/Content/Styles/Framework/pagebuilder.css
diff --git a/PortalCMS.Web/Global.asax b/PortalCMS.Web/Global.asax
new file mode 100644
index 0000000..f746964
--- /dev/null
+++ b/PortalCMS.Web/Global.asax
@@ -0,0 +1 @@
+<%@ Application Codebehind="Global.asax.cs" Inherits="PortalCMS.Web.MvcApplication" Language="C#" %>
diff --git a/PortalCMS.Web/Global.asax.cs b/PortalCMS.Web/Global.asax.cs
new file mode 100644
index 0000000..8aa287b
--- /dev/null
+++ b/PortalCMS.Web/Global.asax.cs
@@ -0,0 +1,49 @@
+using LogBook.Services;
+using LogBook.Services.Models;
+using PortalCMS.Web.Architecture.Helpers;
+using PortalCMS.Web.Architecture.ViewEngines;
+using System.Web.Mvc;
+using System.Web.Optimization;
+using System.Web.Razor;
+using System.Web.Routing;
+using System.Web.WebPages;
+
+namespace PortalCMS.Web
+{
+	public class MvcApplication : System.Web.HttpApplication
+	{
+		protected void Application_Start()
+		{
+			AreaRegistration.RegisterAllAreas();
+			RouteConfig.RegisterRoutes(RouteTable.Routes);
+			BundleConfig.RegisterBundles(BundleTable.Bundles);
+
+			ViewEngines.Engines.Clear();
+			ViewEngines.Engines.Add(new RazorViewEngine());
+			ViewEngines.Engines.Add(new CSSViewEngine());
+
+			RazorCodeLanguage.Languages.Add("cscss", new CSharpRazorCodeLanguage());
+			WebPageHttpHandler.RegisterExtension("cscss");
+
+			MvcHandler.DisableMvcResponseHeader = true;
+
+			new LogHandler().WriteLog(LogType.Information, "Website Started Up", string.Empty);
+		}
+
+		protected void Application_End()
+		{
+			new LogHandler().WriteLog(LogType.Information, "Website Shutting Down", string.Empty);
+		}
+
+		protected void Application_Error()
+		{
+			var logHandler = new LogHandler();
+
+			var exception = Server.GetLastError();
+
+			var user = (UserHelper.IsLoggedIn ? $"{UserHelper.GivenName} {UserHelper.FamilyName} {UserHelper.Id}" : string.Empty);
+
+			logHandler.WriteLog(LogType.Error, "Portal CMS", exception, exception.Message, user);
+		}
+	}
+}
\ No newline at end of file
diff --git a/Portal.CMS.Web/Portal.CMS.Web.csproj b/PortalCMS.Web/PortalCMS.Web.csproj
similarity index 90%
rename from Portal.CMS.Web/Portal.CMS.Web.csproj
rename to PortalCMS.Web/PortalCMS.Web.csproj
index 8eb47e4..5fded2d 100644
--- a/Portal.CMS.Web/Portal.CMS.Web.csproj
+++ b/PortalCMS.Web/PortalCMS.Web.csproj
@@ -14,9 +14,9 @@
     <ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Portal.CMS.Web</RootNamespace>
-    <AssemblyName>Portal.CMS.Web</AssemblyName>
-    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+    <RootNamespace>PortalCMS.Web</RootNamespace>
+    <AssemblyName>PortalCMS.Web</AssemblyName>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <MvcBuildViews>false</MvcBuildViews>
     <UseIISExpress>true</UseIISExpress>
     <IISExpressSSLPort />
@@ -29,6 +29,7 @@
     <ApplicationInsightsResourceId>/subscriptions/e8f8f441-c044-4326-a56c-cfee09da6b3b/resourcegroups/Group/providers/microsoft.insights/components/PortalCMS</ApplicationInsightsResourceId>
     <TargetFrameworkProfile />
     <Use64BitIISExpress />
+    <MinimumVisualStudioVersion>12.0</MinimumVisualStudioVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -58,6 +59,9 @@
     <Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
       <HintPath>..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.SqlServer.dll</HintPath>
     </Reference>
+    <Reference Include="LinkedIn.NET, Version=1.0.2.0, Culture=neutral, PublicKeyToken=88e61090765d8c56, processorArchitecture=MSIL">
+      <HintPath>..\packages\LinkedIn.NET.1.0.2.0\lib\net40-client\LinkedIn.NET.dll</HintPath>
+    </Reference>
     <Reference Include="LogBook.Entities, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\tommcclean.LogBook.1.0.4\lib\net452\LogBook.Entities.dll</HintPath>
       <Private>True</Private>
@@ -79,14 +83,14 @@
       <HintPath>..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
-    <Reference Include="Microsoft.Owin, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Owin.4.0.0\lib\net451\Microsoft.Owin.dll</HintPath>
+    <Reference Include="Microsoft.Owin, Version=4.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Owin.4.0.1\lib\net45\Microsoft.Owin.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Owin.Host.SystemWeb, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Owin.Host.SystemWeb.4.0.0\lib\net451\Microsoft.Owin.Host.SystemWeb.dll</HintPath>
+    <Reference Include="Microsoft.Owin.Host.SystemWeb, Version=4.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Owin.Host.SystemWeb.4.0.1\lib\net45\Microsoft.Owin.Host.SystemWeb.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Owin.Security, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Owin.Security.4.0.0\lib\net451\Microsoft.Owin.Security.dll</HintPath>
+    <Reference Include="Microsoft.Owin.Security, Version=4.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Owin.Security.4.0.1\lib\net45\Microsoft.Owin.Security.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Owin.Security.Cookies, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.Owin.Security.Cookies.4.0.0\lib\net451\Microsoft.Owin.Security.Cookies.dll</HintPath>
@@ -100,8 +104,8 @@
     <Reference Include="Microsoft.Owin.Security.MicrosoftAccount, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.Owin.Security.MicrosoftAccount.4.0.0\lib\net451\Microsoft.Owin.Security.MicrosoftAccount.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Owin.Security.OAuth, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Owin.Security.OAuth.4.0.0\lib\net451\Microsoft.Owin.Security.OAuth.dll</HintPath>
+    <Reference Include="Microsoft.Owin.Security.OAuth, Version=4.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Owin.Security.OAuth.4.0.1\lib\net45\Microsoft.Owin.Security.OAuth.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Owin.Security.Twitter, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.Owin.Security.Twitter.4.0.0\lib\net451\Microsoft.Owin.Security.Twitter.dll</HintPath>
@@ -109,8 +113,17 @@
     <Reference Include="Microsoft.Practices.ServiceLocation, Version=1.3.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\CommonServiceLocator.1.3\lib\portable-net4+sl5+netcore45+wpa81+wp8\Microsoft.Practices.ServiceLocation.dll</HintPath>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+    </Reference>
+    <Reference Include="Owin.Security.Providers.LinkedIn, Version=2.0.0.0, Culture=neutral, PublicKeyToken=1328b8c16b108c43, processorArchitecture=MSIL">
+      <HintPath>..\packages\Owin.Security.Providers.LinkedIn.2.25.0\lib\net45\Owin.Security.Providers.LinkedIn.dll</HintPath>
+    </Reference>
+    <Reference Include="Recaptcha.Web, Version=2.1.0.0, Culture=neutral, PublicKeyToken=171a6ec5fa4b1644, processorArchitecture=MSIL">
+      <HintPath>..\packages\RecaptchaNet.2.1.0\lib\net451\Recaptcha.Web.dll</HintPath>
+    </Reference>
+    <Reference Include="RestSharp, Version=106.6.7.0, Culture=neutral, PublicKeyToken=598062e77f915f75, processorArchitecture=MSIL">
+      <HintPath>..\packages\RestSharp.106.6.7\lib\net452\RestSharp.dll</HintPath>
     </Reference>
     <Reference Include="SendGrid, Version=9.8.0.0, Culture=neutral, PublicKeyToken=4f047e93159395ca, processorArchitecture=MSIL">
       <HintPath>..\packages\Sendgrid.9.9.0\lib\net452\SendGrid.dll</HintPath>
@@ -129,7 +142,6 @@
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
-    <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.Net.Http, Version=4.1.1.2, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Net.Http.4.3.3\lib\net46\System.Net.Http.dll</HintPath>
@@ -137,9 +149,6 @@
     <Reference Include="System.Net.Http.Formatting, Version=5.2.6.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.AspNet.WebApi.Client.5.2.6\lib\net45\System.Net.Http.Formatting.dll</HintPath>
     </Reference>
-    <Reference Include="System.Security.Cryptography.Algorithms, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Security.Cryptography.Algorithms.4.3.0\lib\net461\System.Security.Cryptography.Algorithms.dll</HintPath>
-    </Reference>
     <Reference Include="System.Security.Cryptography.Encoding, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Security.Cryptography.Encoding.4.3.0\lib\net46\System.Security.Cryptography.Encoding.dll</HintPath>
     </Reference>
@@ -154,7 +163,6 @@
     <Reference Include="System.Web.Entity" />
     <Reference Include="System.Web.ApplicationServices" />
     <Reference Include="System.ComponentModel.DataAnnotations" />
-    <Reference Include="System.Web.Extensions" />
     <Reference Include="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.6\lib\net45\System.Web.Helpers.dll</HintPath>
     </Reference>
@@ -195,7 +203,6 @@
     <Reference Include="System.Web.Optimization">
       <HintPath>..\packages\Microsoft.AspNet.Web.Optimization.1.1.3\lib\net40\System.Web.Optimization.dll</HintPath>
     </Reference>
-    <Reference Include="System.Xml.Linq" />
     <Reference Include="WebActivatorEx, Version=2.0.0.0, Culture=neutral, PublicKeyToken=7b26dc2a43f6a0d4, processorArchitecture=MSIL">
       <HintPath>..\packages\WebActivatorEx.2.2.0\lib\net40\WebActivatorEx.dll</HintPath>
       <Private>True</Private>
@@ -213,6 +220,7 @@
   <ItemGroup>
     <Compile Include="App_Start\BundleConfig.cs" />
     <Compile Include="App_Start\RouteConfig.cs" />
+    <Compile Include="App_Start\Startup.Auth.cs" />
     <Compile Include="App_Start\StructuremapMvc.cs" />
     <Compile Include="Architecture\ActionFilters\ActionFilterResponseType.cs" />
     <Compile Include="Architecture\ActionFilters\ValidateJsonAntiForgeryTokenAttribute.cs" />
@@ -248,13 +256,16 @@
     <Compile Include="Areas\Admin\ViewModels\AnalyticManager\ColumnViewModel.cs" />
     <Compile Include="Areas\Admin\ViewModels\AnalyticManager\LogEntriesViewModel.cs" />
     <Compile Include="Areas\Admin\ViewModels\AnalyticManager\ReviewExceptionViewModel.cs" />
-    <Compile Include="Areas\Authentication\Controllers\RecoveryController.cs" />
+    <Compile Include="Areas\Authentication\Controllers\LinkedInController.cs" />
+    <Compile Include="Areas\Authentication\Controllers\PasswordRecoveryController.cs" />
     <Compile Include="Areas\Authentication\Controllers\RegistrationController.cs" />
     <Compile Include="Areas\Authentication\Controllers\SingleSignOnController.cs" />
     <Compile Include="Areas\Authentication\ViewModel\Login\LoginViewModel.cs" />
-    <Compile Include="Areas\Authentication\ViewModel\Recovery\ResetViewModel.cs" />
+    <Compile Include="Areas\Authentication\ViewModel\Login\SendCodeViewModel.cs" />
+    <Compile Include="Areas\Authentication\ViewModel\PasswordRecovery\ResetViewModel.cs" />
     <Compile Include="Areas\Authentication\AuthenticationAreaRegistration.cs" />
     <Compile Include="Areas\Authentication\Controllers\LoginController.cs" />
+    <Compile Include="Areas\BaseController.cs" />
     <Compile Include="Areas\Forms\Controllers\ContactWidgetsController.cs" />
     <Compile Include="Areas\Forms\FormsAreaRegistration.cs" />
     <Compile Include="Areas\Forms\ViewModels\ContactWidgets\SubmitMessageViewModel.cs" />
@@ -318,6 +329,8 @@
     <Compile Include="Areas\PageBuilder\Controllers\ErrorController.cs" />
     <Compile Include="Areas\Profile\Controllers\WidgetsController.cs" />
     <Compile Include="Areas\Profile\ProfileAreaRegistration.cs" />
+    <Compile Include="Areas\SignInController.cs" />
+    <Compile Include="Startup.cs" />
     <Compile Include="ViewModels\Shared\PaginationViewModel.cs" />
     <Compile Include="Areas\PageBuilder\ViewModels\Theme\ThemeViewModel.cs" />
     <Compile Include="Areas\Blog\ViewModels\Widgets\PostsWidgetViewModel.cs" />
@@ -350,7 +363,9 @@
     <Content Include="Areas\Admin\Content\Images\icon-settings.png" />
     <Content Include="Areas\Admin\Content\Images\icon-thememanager.png" />
     <Content Include="Areas\Admin\Content\Images\icon-users.png" />
+    <Content Include="Areas\Admin\Content\Images\noimage.png" />
     <Content Include="Areas\Admin\Content\Images\profile-image-male.png" />
+    <Content Include="Areas\Admin\Content\Images\recaptcha.png" />
     <Content Include="Areas\Authentication\Content\Images\reset-background-image.jpg" />
     <Content Include="Areas\PageBuilder\Content\Images\Sample\icon-7.png" />
     <Content Include="Areas\PageBuilder\Content\Images\Sample\icon-8.png" />
@@ -361,6 +376,12 @@
     <Content Include="Areas\Profile\Content\Images\admin-icon.png" />
     <Content Include="Areas\Profile\Content\Images\security-image.jpg" />
     <Content Include="Areas\PageBuilder\Content\Images\Sample\sample-9.png" />
+    <Content Include="Content\EmailTemplates\AccountActivationLink.html" />
+    <Content Include="Content\EmailTemplates\Base\Base.html" />
+    <Content Include="Content\EmailTemplates\PasswordChanged.html" />
+    <Content Include="Content\EmailTemplates\Default.html" />
+    <Content Include="Content\EmailTemplates\ContactUsMessage.html" />
+    <Content Include="Content\EmailTemplates\PasswordResetLink.html" />
     <Content Include="Content\Plugins\FontAwesome\fontawesome-webfont.svg" />
     <Content Include="Content\Scripts\EditablePopover\editable.popover.js" />
     <Content Include="Content\Scripts\Framework\PageBuilder-Anonymous.js" />
@@ -457,10 +478,6 @@
     <Content Include="Web.Debug.config">
       <DependentUpon>Web.config</DependentUpon>
     </Content>
-    <Content Include="Web.Release.config">
-      <DependentUpon>Web.config</DependentUpon>
-      <SubType>Designer</SubType>
-    </Content>
     <Content Include="Views\Web.config" />
   </ItemGroup>
   <ItemGroup>
@@ -486,16 +503,6 @@
   <ItemGroup>
     <Content Include="Areas\Admin\Views\BlogManager\Index.cshtml" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Portal.CMS.Entities\Portal.CMS.Entities.csproj">
-      <Project>{13103a2e-ff04-442f-95f6-c2e8edb0f274}</Project>
-      <Name>Portal.CMS.Entities</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Portal.CMS.Services\Portal.CMS.Services.csproj">
-      <Project>{153c71ed-5f82-4755-aa59-e468b026d4bb}</Project>
-      <Name>Portal.CMS.Services</Name>
-    </ProjectReference>
-  </ItemGroup>
   <ItemGroup>
     <Content Include="Content\Fonts\Emeric.ttf" />
   </ItemGroup>
@@ -719,7 +726,7 @@
     <Content Include="Areas\Profile\Views\Widgets\_SignIn.cshtml" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Areas\Authentication\Views\Recovery\Reset.cshtml" />
+    <Content Include="Areas\Authentication\Views\PasswordRecovery\Reset.cshtml" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Areas\Blog\Views\Widgets\_RetroWidget.cshtml" />
@@ -773,6 +780,44 @@
   <ItemGroup>
     <Content Include="Content\Fonts\OpenSans-Regular.ttf" />
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="Areas\Authentication\Views\Login\_LockoutForm.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Areas\Authentication\Views\PasswordRecovery\_RecoveryForm.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\PortalCMS.Entities\PortalCMS.Entities.csproj">
+      <Project>{13103a2e-ff04-442f-95f6-c2e8edb0f274}</Project>
+      <Name>PortalCMS.Entities</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\PortalCMS.Library\PortalCMS.Library.csproj">
+      <Project>{C846D9FA-206A-4D28-B6B3-2E5A8DCC31F8}</Project>
+      <Name>PortalCMS.Library</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\PortalCMS.Repositories\PortalCMS.Repositories.csproj">
+      <Project>{7dde9d80-5c8b-4a3a-9193-14dc827bd07c}</Project>
+      <Name>PortalCMS.Repositories</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\PortalCMS.Services\PortalCMS.Services.csproj">
+      <Project>{153c71ed-5f82-4755-aa59-e468b026d4bb}</Project>
+      <Name>PortalCMS.Services</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Areas\Authentication\Views\Login\_SendCode.cshtml" />
+    <Content Include="Areas\Authentication\Views\Login\_VerifyCode.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Areas\Authentication\Views\Registration\_Welcome.cshtml" />
+    <Content Include="Areas\Authentication\Views\Registration\_EmailConfirmed.cshtml" />
+    <Content Include="Areas\Authentication\Views\Registration\_RegistrationSimpleForm.cshtml" />
+    <None Include="Properties\PublishProfiles\FolderProfile.pubxml" />
+    <None Include="Web.Release.config">
+      <DependentUpon>Web.config</DependentUpon>
+      <SubType>Designer</SubType>
+    </None>
+  </ItemGroup>
   <PropertyGroup>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
@@ -787,16 +832,19 @@
     <VisualStudio>
       <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
         <WebProjectProperties>
-          <UseIIS>False</UseIIS>
+          <UseIIS>True</UseIIS>
           <AutoAssignPort>True</AutoAssignPort>
           <DevelopmentServerPort>52001</DevelopmentServerPort>
           <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>http://localhost:52001/</IISUrl>
+          <IISUrl>http://localhost:56500</IISUrl>
           <NTLMAuthentication>False</NTLMAuthentication>
           <UseCustomServer>False</UseCustomServer>
           <CustomServerUrl>
           </CustomServerUrl>
           <SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
+          <servers defaultServer="">
+            <server name="OwinHost" exePath="{solutiondir}\packages\OwinHost.4.0.1\tools\OwinHost.exe" cmdArgs="-u {url}" url="http://localhost:12345/" workingDir="{projectdir}" />
+          </servers>
         </WebProjectProperties>
       </FlavorProperties>
     </VisualStudio>
diff --git a/Portal.CMS.Web/Properties/AssemblyInfo.cs b/PortalCMS.Web/Properties/AssemblyInfo.cs
similarity index 85%
rename from Portal.CMS.Web/Properties/AssemblyInfo.cs
rename to PortalCMS.Web/Properties/AssemblyInfo.cs
index 7b41a55..010a56c 100644
--- a/Portal.CMS.Web/Properties/AssemblyInfo.cs
+++ b/PortalCMS.Web/Properties/AssemblyInfo.cs
@@ -1,11 +1,11 @@
 using System.Reflection;
 using System.Runtime.InteropServices;
 
-[assembly: AssemblyTitle("Portal.CMS.Web")]
+[assembly: AssemblyTitle("PortalCMS.Web")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Portal.CMS.Web")]
+[assembly: AssemblyProduct("PortalCMS.Web")]
 [assembly: AssemblyCopyright("Copyright ©  2016")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
diff --git a/PortalCMS.Web/Properties/PublishProfiles/FolderProfile.pubxml b/PortalCMS.Web/Properties/PublishProfiles/FolderProfile.pubxml
new file mode 100644
index 0000000..4711219
--- /dev/null
+++ b/PortalCMS.Web/Properties/PublishProfiles/FolderProfile.pubxml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+This file is used by the publish/package process of your Web project. You can customize the behavior of this process
+by editing this MSBuild file. In order to learn more about this please visit https://go.microsoft.com/fwlink/?LinkID=208121. 
+-->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <WebPublishMethod>FileSystem</WebPublishMethod>
+    <PublishProvider>FileSystem</PublishProvider>
+    <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
+    <LastUsedPlatform>Any CPU</LastUsedPlatform>
+    <SiteUrlToLaunchAfterPublish />
+    <LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
+    <ExcludeApp_Data>True</ExcludeApp_Data>
+    <publishUrl>C:\inetpub\wwwroot\MENTORDOJO\PortalCMS.v14\Published</publishUrl>
+    <DeleteExistingFiles>True</DeleteExistingFiles>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/PortalCMS.Web/Startup.cs b/PortalCMS.Web/Startup.cs
new file mode 100644
index 0000000..01d9473
--- /dev/null
+++ b/PortalCMS.Web/Startup.cs
@@ -0,0 +1,14 @@
+using Microsoft.Owin;
+using Owin;
+
+[assembly: OwinStartup(typeof(PortalCMS.Web.Startup))]
+namespace PortalCMS.Web
+{
+	public partial class Startup
+	{
+		public void Configuration(IAppBuilder app)
+		{
+			ConfigureAuth(app);
+		}
+	}
+}
diff --git a/Portal.CMS.Web/ViewModels/Shared/PaginationViewModel.cs b/PortalCMS.Web/ViewModels/Shared/PaginationViewModel.cs
similarity index 84%
rename from Portal.CMS.Web/ViewModels/Shared/PaginationViewModel.cs
rename to PortalCMS.Web/ViewModels/Shared/PaginationViewModel.cs
index 541f744..d93196c 100644
--- a/Portal.CMS.Web/ViewModels/Shared/PaginationViewModel.cs
+++ b/PortalCMS.Web/ViewModels/Shared/PaginationViewModel.cs
@@ -1,9 +1,9 @@
-using Portal.CMS.Entities.Entities;
+using PortalCMS.Entities.Entities;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 
-namespace Portal.CMS.Web.ViewModels.Shared
+namespace PortalCMS.Web.ViewModels.Shared
 {
     public class PaginationViewModel
     {
diff --git a/Portal.CMS.Web/Views/Shared/_Analytics.cshtml b/PortalCMS.Web/Views/Shared/_Analytics.cshtml
similarity index 100%
rename from Portal.CMS.Web/Views/Shared/_Analytics.cshtml
rename to PortalCMS.Web/Views/Shared/_Analytics.cshtml
diff --git a/Portal.CMS.Web/Views/Shared/_Layout.cshtml b/PortalCMS.Web/Views/Shared/_Layout.cshtml
similarity index 79%
rename from Portal.CMS.Web/Views/Shared/_Layout.cshtml
rename to PortalCMS.Web/Views/Shared/_Layout.cshtml
index d071959..624d35c 100644
--- a/Portal.CMS.Web/Views/Shared/_Layout.cshtml
+++ b/PortalCMS.Web/Views/Shared/_Layout.cshtml
@@ -43,15 +43,18 @@
     @Html.Partial("_Analytics")
 </head>
 <body class="page-builder">
-    @Html.AntiForgeryToken()
+	@Html.AntiForgeryToken()
 
-    @Html.Partial("_NavBar")
-    @RenderBody()
+	@Html.Partial("_NavBar")
+	@RenderBody()
 
-    @Scripts.Render("~/Plugins/Bootstrap/Scripts")
-    @Scripts.Render("~/Plugins/Popover/Scripts")
-    @Scripts.Render("~/Plugins/Confirmation/Scripts")
-    @Scripts.Render("~/Resources/JavaScript/Framework")
-    @RenderSection("DOMScripts", false)
+	@Scripts.Render("~/Plugins/Bootstrap/Scripts")
+	@Scripts.Render("~/Plugins/Popover/Scripts")
+	@Scripts.Render("~/Plugins/Confirmation/Scripts")
+	@Scripts.Render("~/Resources/JavaScript/Framework")
+
+	<script src="https://www.google.com/recaptcha/api.js?render=explicit" async defer></script>
+	
+	@RenderSection("DOMScripts", false)
 </body>
 </html>
\ No newline at end of file
diff --git a/Portal.CMS.Web/Views/Shared/_NavBar.cshtml b/PortalCMS.Web/Views/Shared/_NavBar.cshtml
similarity index 55%
rename from Portal.CMS.Web/Views/Shared/_NavBar.cshtml
rename to PortalCMS.Web/Views/Shared/_NavBar.cshtml
index 594214d..24aa903 100644
--- a/Portal.CMS.Web/Views/Shared/_NavBar.cshtml
+++ b/PortalCMS.Web/Views/Shared/_NavBar.cshtml
@@ -5,12 +5,26 @@
     var isAdmin = UserHelper.IsAdmin;
     var isEditor = UserHelper.IsEditor;
 }
-
+<style>
+	.websiteLogo {
+		height: 30px;
+		margin-top: -4px;
+	}
+</style>
 <nav class="navbar navbar-inverse">
     <div class="container-fluid">
         <div class="navbar-header">
             <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#main-menu" aria-expanded="false"><span class="sr-only">Toggle navigation</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button>
-            <a class="navbar-brand" href="@Url.Action("Index", "Home", new { area = "" })">@SettingHelper.Get("Website Name")</a>
+						<a class="navbar-brand" href="@Url.Action("Index", "Home", new { area = "" })">
+							@if (SettingHelper.GetImage("Website Logo") == null)
+							{
+								@SettingHelper.Get("Website Name")
+							}
+							else
+							{
+								<img src="data:image/jpeg;base64,@Convert.ToBase64String(SettingHelper.GetImage("Website Logo"))" class="websiteLogo" />
+							}
+						</a>
         </div>
 
         <div class="collapse navbar-collapse" id="main-menu">
@@ -35,28 +49,35 @@
             </ul>
 
             @if (isLoggedIn)
-            {
+						{
                 <ul class="nav navbar-nav navbar-right">
                     <li class="dropdown">
-                        <a href="#" class="dropdown-toggle btn" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"><span class="fa fa-user"></span>@UserHelper.FullName <span class="caret"></span></a>
+											<a href="#" class="dropdown-toggle btn" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
+												<img class="avatar navbar-profileImage" alt="My Avatar" src="data:image/jpeg;base64,@Convert.ToBase64String(UserHelper.AvatarImage)" />
+												@UserHelper.FullName <span class="caret"></span>
+											</a>
                         <ul class="dropdown-menu">
-                            <li><a href="@Url.Action("EditAccount", "Manage", new { area="Profile"})" class="launch-modal" data-title="Update Account"><span class="fa fa-user"></span>Update Account</a></li>
-                            <li><a href="@Url.Action("EditBio", "Manage", new { area="Profile"})" class="launch-modal" data-title="Update Bio"><span class="fa fa-book"></span>Update Bio</a></li>
-                            <li><a href="@Url.Action("EditAvatar", "Manage", new { area="Profile"})" class="launch-modal" data-title="Upload Avatar"><span class="fa fa-picture-o"></span>Upload Avatar</a></li>
-                            <li><a href="@Url.Action("EditPassword", "Manage", new { area="Profile"})" class="launch-modal" data-title="Change Password"><span class="fa fa-key"></span>Change Password</a></li>
+                            <li>
+															<a href="@Url.Action("EditAccount", "Manage", new { area = "Profile" })" class="launch-modal" data-title="Update Account">
+																<span class="fa fa-user"></span>Update Account
+															</a>
+														</li>
+                            <li><a href="@Url.Action("EditBio", "Manage", new { area = "Profile" })" class="launch-modal" data-title="Update Bio"><span class="fa fa-book"></span>Update Bio</a></li>
+                            <li><a href="@Url.Action("EditAvatar", "Manage", new { area = "Profile" })" class="launch-modal" data-title="Upload Avatar"><span class="fa fa-picture-o"></span>Upload Avatar</a></li>
+                            <li><a href="@Url.Action("EditPassword", "Manage", new { area = "Profile" })" class="launch-modal" data-title="Change Password"><span class="fa fa-key"></span>Change Password</a></li>
                             <li role="separator" class="divider"></li>
-                            <li><a href="@Url.Action("Logout", "Login", new { area="Authentication"})"><span class="fa fa-lock"></span>Logout</a></li>
+                            <li><a href="@Url.Action("Logout", "Login", new { area = "Authentication" })"><span class="fa fa-lock"></span>Logout</a></li>
                         </ul>
                     </li>
                 </ul>
-            }
-            else
-            {
+						}
+						else
+						{
                 <ul class="nav navbar-nav navbar-right">
-                    <li><a href="@Url.Action("Index", "Login", new { area="Authentication"})" class="launch-modal" data-title="Sign In"><span class="fa fa-lock"></span>Login</a></li>
-                    <li><a href="@Url.Action("Index", "Registration", new { area="Authentication"})" class="launch-modal" data-title="Register Account"><span class="fa fa-user"></span>Register</a></li>
+                    <li><a href="@Url.Action("Index", "Login", new { area = "Authentication" })" class="launch-modal" data-title="Sign In"><span class="fa fa-lock"></span>Login</a></li>
+                    <li><a href="@Url.Action("Index", "Registration", new { area = "Authentication" })" class="launch-modal" data-title="Register Account"><span class="fa fa-user"></span>Register</a></li>
                 </ul>
-            }
+						}
         </div>
     </div>
 </nav>
\ No newline at end of file
diff --git a/Portal.CMS.Web/Views/Shared/_RenderPage.cshtml b/PortalCMS.Web/Views/Shared/_RenderPage.cshtml
similarity index 89%
rename from Portal.CMS.Web/Views/Shared/_RenderPage.cshtml
rename to PortalCMS.Web/Views/Shared/_RenderPage.cshtml
index 5dc6f84..012a75c 100644
--- a/Portal.CMS.Web/Views/Shared/_RenderPage.cshtml
+++ b/PortalCMS.Web/Views/Shared/_RenderPage.cshtml
@@ -1,5 +1,5 @@
-@model Portal.CMS.Web.ViewModels.Shared.PaginationViewModel
-@using Portal.CMS.Web.Architecture.Extensions
+@model PortalCMS.Web.ViewModels.Shared.PaginationViewModel
+@using PortalCMS.Web.Architecture.Extensions
 
 <div class="pagination-wrapper @Model.PaginationType" data-type="@Model.PaginationType">
     @for (var page = 1; page <= Model.PageCount; page += 1)
diff --git a/Portal.CMS.Web/Views/Shared/_RenderPopoverPage.cshtml b/PortalCMS.Web/Views/Shared/_RenderPopoverPage.cshtml
similarity index 90%
rename from Portal.CMS.Web/Views/Shared/_RenderPopoverPage.cshtml
rename to PortalCMS.Web/Views/Shared/_RenderPopoverPage.cshtml
index 86357b5..a0ceed7 100644
--- a/Portal.CMS.Web/Views/Shared/_RenderPopoverPage.cshtml
+++ b/PortalCMS.Web/Views/Shared/_RenderPopoverPage.cshtml
@@ -1,5 +1,5 @@
-@model Portal.CMS.Web.ViewModels.Shared.PaginationViewModel
-@using Portal.CMS.Web.Architecture.Extensions
+@model PortalCMS.Web.ViewModels.Shared.PaginationViewModel
+@using PortalCMS.Web.Architecture.Extensions
 
 @if (Model.PageCount > 1)
 {
diff --git a/Portal.CMS.Web/Views/Web.config b/PortalCMS.Web/Views/Web.config
similarity index 83%
rename from Portal.CMS.Web/Views/Web.config
rename to PortalCMS.Web/Views/Web.config
index 8c17072..b7b4ed1 100644
--- a/Portal.CMS.Web/Views/Web.config
+++ b/PortalCMS.Web/Views/Web.config
@@ -17,12 +17,12 @@
         <add namespace="System.Web.Mvc.Html" />
         <add namespace="System.Web.Optimization" />
         <add namespace="System.Web.Routing" />
-        <add namespace="Portal.CMS.Web" />
-        <add namespace="Portal.CMS.Web.Architecture.Helpers" />
-        <add namespace="Portal.CMS.Web.Architecture.Extensions" />
-        <add namespace="Portal.CMS.Web.Areas.Admin.ViewModels.Dashboard" />
-        <add namespace="Portal.CMS.Entities.Enumerators" />
-        <add namespace="Portal.CMS.Entities.Entities" />
+        <add namespace="PortalCMS.Web" />
+        <add namespace="PortalCMS.Web.Architecture.Helpers" />
+        <add namespace="PortalCMS.Web.Architecture.Extensions" />
+        <add namespace="PortalCMS.Web.Areas.Admin.ViewModels.Dashboard" />
+        <add namespace="PortalCMS.Entities.Enumerators" />
+        <add namespace="PortalCMS.Entities.Entities" />
       </namespaces>
     </pages>
   </system.web.webPages.razor>
diff --git a/Portal.CMS.Web/Views/_ViewStart.cshtml b/PortalCMS.Web/Views/_ViewStart.cshtml
similarity index 100%
rename from Portal.CMS.Web/Views/_ViewStart.cshtml
rename to PortalCMS.Web/Views/_ViewStart.cshtml
diff --git a/PortalCMS.Web/Web.Debug.config b/PortalCMS.Web/Web.Debug.config
new file mode 100644
index 0000000..0fe71f9
--- /dev/null
+++ b/PortalCMS.Web/Web.Debug.config
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
+  <connectionStrings>
+    <add name="PortalDbConnection" connectionString="data source=localhost\hyperbird;initial catalog=Portal;integrated security=True;MultipleActiveResultSets=True;App=EntityFramework" providerName="System.Data.SqlClient" />
+  </connectionStrings>
+</configuration>
\ No newline at end of file
diff --git a/PortalCMS.Web/Web.config b/PortalCMS.Web/Web.config
new file mode 100644
index 0000000..a6d2666
--- /dev/null
+++ b/PortalCMS.Web/Web.config
@@ -0,0 +1,379 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <configSections>
+    <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
+  </configSections>
+  <connectionStrings>
+    <add name="PortalDbConnection" connectionString="data source=localhost;initial catalog=PortalCMS;integrated security=True;MultipleActiveResultSets=True;App=EntityFramework" providerName="System.Data.SqlClient" />
+    <add name="LogBookEntityModel" connectionString="data source=localhost;initial catalog=PortalCMS;integrated security=True;MultipleActiveResultSets=True;App=EntityFramework" providerName="System.Data.SqlClient" />
+  </connectionStrings>
+  <appSettings>
+    <add key="webpages:Version" value="3.0.0.0" />
+    <add key="webpages:Enabled" value="false" />
+    <add key="ClientValidationEnabled" value="true" />
+    <add key="UnobtrusiveJavaScriptEnabled" value="true" />
+    <add key="owin:AutomaticAppStartup" value="true" />
+    <add key="CustomErrorPage" value="false" />
+    <add key="vs:EnableBrowserLink" value="false" />
+
+		<add key="Linkedin.ClientID" value="xxxxxx" />
+		<add key="Linkedin.SecretKey" value="xxxxxx" />
+	</appSettings>
+  <!--
+    For a description of web.config changes see http://go.microsoft.com/fwlink/?LinkId=235367.
+
+    The following attributes can be set on the <httpRuntime> tag.
+      <system.Web>
+        <httpRuntime targetFramework="4.6.1" />
+      </system.Web>
+  -->
+  <system.web>
+    <httpCookies httpOnlyCookies="true" />
+    <authentication mode="None" />
+    <compilation debug="true" targetFramework="4.6.1">
+      <buildProviders>
+        <add extension=".cscss" type="System.Web.WebPages.Razor.RazorBuildProvider, System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
+      </buildProviders>
+    </compilation>
+    <httpRuntime targetFramework="4.5.2" enableVersionHeader="false" />
+    <httpModules>
+      <remove name="WindowsAuthentication" />
+      <remove name="PassportAuthentication" />
+      <remove name="Profile" />
+      <remove name="AnonymousIdentification" />
+    </httpModules>
+    <trace enabled="false" />
+    <customErrors mode="Off" defaultRedirect="~/PageBuilder/Error/Index">
+      <error statusCode="404" redirect="~/PageBuilder/Error/NotFound" />
+    </customErrors>
+  </system.web>
+  <system.webServer>
+    <validation validateIntegratedModeConfiguration="false" />
+    <urlCompression doStaticCompression="true" doDynamicCompression="true" dynamicCompressionBeforeCache="true" />
+    <staticContent>
+      <clientCache cacheControlMode="UseMaxAge" cacheControlMaxAge="30.00:00:00" />
+      <remove fileExtension=".woff" />
+      <mimeMap fileExtension=".woff" mimeType="application/x-font-woff" />
+      <remove fileExtension=".woff2" />
+      <mimeMap fileExtension=".woff2" mimeType="font/woff2" />
+      <remove fileExtension=".otf" />
+      <mimeMap fileExtension=".otf" mimeType="font/otf" />
+    </staticContent>
+    <httpProtocol>
+      <customHeaders>
+        <remove name="X-Powered-By" />
+        <remove name="X-Content-Type-Options" />
+        <add name="X-Content-Type-Options" value="nosniff" />
+        <remove name="X-XSS-Protection" />
+        <add name="X-XSS-Protection" value="1; mode=block" />
+        <remove name="X-Frame-Options" />
+        <add name="X-Frame-Options" value="DENY" />
+      </customHeaders>
+      <redirectHeaders>
+        <clear />
+      </redirectHeaders>
+    </httpProtocol>
+    <modules>
+      <remove name="FormsAuthentication" />
+      <add name="RemoveResponseHeadersModule" type="PortalCMS.Web.Architecture.Modules.RemoveResponseHeadersModule" />
+    </modules>
+    <rewrite>
+      <outboundRules rewriteBeforeCache="true">
+        <rule name="Remove Server Header">
+          <match serverVariable="RESPONSE_SERVER" pattern=".+" />
+          <action type="Rewrite" value="" />
+        </rule>
+      </outboundRules>
+    </rewrite>
+    <handlers>
+      <remove name="ExtensionlessUrlHandler-Integrated-4.0" />
+      <remove name="OPTIONSVerbHandler" />
+      <remove name="TRACEVerbHandler" />
+      <add name="ExtensionlessUrlHandler-Integrated-4.0" path="*." verb="*" type="System.Web.Handlers.TransferRequestHandler" preCondition="integratedMode,runtimeVersionv4.0" />
+    </handlers>
+  </system.webServer>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+			<dependentAssembly>
+				<assemblyIdentity name="System.Threading" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Threading.Tasks" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Threading.Overlapped" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Text.Encoding.Extensions" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Text.Encoding" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Globalization" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Security.SecureString" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Threading.Timer" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Runtime.InteropServices.RuntimeInformation" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Net.Primitives" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Reflection" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Net.Sockets" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Collections" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Xml.ReaderWriter" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-4.1.1.0" newVersion="4.1.1.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.IO" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Diagnostics.Debug" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Resources.ResourceManager" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Runtime" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Linq.Queryable" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Runtime.InteropServices" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Security.Cryptography.Algorithms" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-4.3.0.0" newVersion="4.3.0.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Text.RegularExpressions" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-4.1.1.0" newVersion="4.1.1.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.ComponentModel" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.IO.Compression" publicKeyToken="B77A5C561934E089" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Diagnostics.Contracts" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Runtime.Extensions" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Runtime.Numerics" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.ComponentModel.EventBasedAsync" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Collections.Concurrent" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Diagnostics.Tracing" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Dynamic.Runtime" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Reflection.Primitives" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Security.Principal" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Linq" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Reflection.Extensions" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Linq.Parallel" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Diagnostics.StackTrace" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Xml.XmlSerializer" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Globalization.Extensions" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Net.NetworkInformation" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Xml.XDocument" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Runtime.Serialization.Json" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.ObjectModel" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Xml.XPath.XDocument" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Linq.Expressions" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Threading.Tasks.Parallel" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Runtime.Serialization.Primitives" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.ValueTuple" publicKeyToken="CC7B13FFCD2DDD51" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Diagnostics.Tools" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Net.Requests" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Data.Common" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Runtime.Serialization.Xml" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-4.1.3.0" newVersion="4.1.3.0" />
+			</dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Owin.Security" publicKeyToken="31bf3856ad364e35" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Owin.Security.OAuth" publicKeyToken="31bf3856ad364e35" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Owin.Security.Cookies" publicKeyToken="31bf3856ad364e35" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Newtonsoft.Json" culture="neutral" publicKeyToken="30ad4fe6b2a6aeed" />
+        <bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Web.Optimization" publicKeyToken="31bf3856ad364e35" />
+        <bindingRedirect oldVersion="1.0.0.0-1.1.0.0" newVersion="1.1.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" />
+        <bindingRedirect oldVersion="0.0.0.0-1.6.5135.21930" newVersion="1.6.5135.21930" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Antlr3.Runtime" publicKeyToken="eb42632606e9261f" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-3.5.0.2" newVersion="3.5.0.2" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35" />
+        <bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" />
+        <bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
+        <bindingRedirect oldVersion="0.0.0.0-5.2.6.0" newVersion="5.2.6.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.1.2" newVersion="4.1.1.2" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-5.2.6.0" newVersion="5.2.6.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-5.2.6.0" newVersion="5.2.6.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+  <entityFramework>
+    <defaultConnectionFactory type="System.Data.Entity.Infrastructure.LocalDbConnectionFactory, EntityFramework">
+      <parameters>
+        <parameter value="mssqllocaldb" />
+      </parameters>
+    </defaultConnectionFactory>
+    <providers>
+      <provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer" />
+    </providers>
+  </entityFramework>
+  <system.codedom>
+    <compilers>
+      <compiler language="c#;cs;csharp" extension=".cs" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.CSharpCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:default /nowarn:1659;1699;1701" />
+      <compiler language="vb;vbs;visualbasic;vbscript" extension=".vb" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.VBCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:default /nowarn:41008 /define:_MYTYPE=\&quot;Web\&quot; /optionInfer+" />
+    </compilers>
+  </system.codedom>
+</configuration>
diff --git a/Portal.CMS.Web/favicon.ico b/PortalCMS.Web/favicon.ico
similarity index 100%
rename from Portal.CMS.Web/favicon.ico
rename to PortalCMS.Web/favicon.ico
diff --git a/Portal.CMS.Web/packages.config b/PortalCMS.Web/packages.config
similarity index 81%
rename from Portal.CMS.Web/packages.config
rename to PortalCMS.Web/packages.config
index 2a88eab..b6118ac 100644
--- a/Portal.CMS.Web/packages.config
+++ b/PortalCMS.Web/packages.config
@@ -3,6 +3,7 @@
   <package id="Antlr" version="3.5.0.2" targetFramework="net452" />
   <package id="CommonServiceLocator" version="1.3" targetFramework="net461" />
   <package id="EntityFramework" version="6.2.0" targetFramework="net461" />
+  <package id="LinkedIn.NET" version="1.0.2.0" targetFramework="net461" />
   <package id="Microsoft.AspNet.Identity.Core" version="2.2.2" targetFramework="net462" />
   <package id="Microsoft.AspNet.Identity.EntityFramework" version="2.2.2" targetFramework="net462" />
   <package id="Microsoft.AspNet.Identity.Owin" version="2.2.2" targetFramework="net462" />
@@ -17,18 +18,21 @@
   <package id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="2.0.1" targetFramework="net462" />
   <package id="Microsoft.DiaSymReader.Native" version="1.5.0" targetFramework="net461" />
   <package id="Microsoft.Net.Compilers" version="2.9.0" targetFramework="net462" developmentDependency="true" />
-  <package id="Microsoft.Owin" version="4.0.0" targetFramework="net462" />
-  <package id="Microsoft.Owin.Host.SystemWeb" version="4.0.0" targetFramework="net462" />
-  <package id="Microsoft.Owin.Security" version="4.0.0" targetFramework="net462" />
+  <package id="Microsoft.Owin" version="4.0.1" targetFramework="net461" />
+  <package id="Microsoft.Owin.Host.SystemWeb" version="4.0.1" targetFramework="net461" />
+  <package id="Microsoft.Owin.Security" version="4.0.1" targetFramework="net461" />
   <package id="Microsoft.Owin.Security.Cookies" version="4.0.0" targetFramework="net462" />
   <package id="Microsoft.Owin.Security.Facebook" version="4.0.0" targetFramework="net462" />
   <package id="Microsoft.Owin.Security.Google" version="4.0.0" targetFramework="net462" />
   <package id="Microsoft.Owin.Security.MicrosoftAccount" version="4.0.0" targetFramework="net462" />
-  <package id="Microsoft.Owin.Security.OAuth" version="4.0.0" targetFramework="net462" />
+  <package id="Microsoft.Owin.Security.OAuth" version="4.0.1" targetFramework="net461" />
   <package id="Microsoft.Owin.Security.Twitter" version="4.0.0" targetFramework="net462" />
   <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net452" />
-  <package id="Newtonsoft.Json" version="11.0.2" targetFramework="net462" />
+  <package id="Newtonsoft.Json" version="12.0.1" targetFramework="net461" />
   <package id="Owin" version="1.0" targetFramework="net452" />
+  <package id="Owin.Security.Providers.LinkedIn" version="2.25.0" targetFramework="net461" />
+  <package id="OwinHost" version="4.0.1" targetFramework="net461" />
+  <package id="RestSharp" version="106.6.7" targetFramework="net461" />
   <package id="Sendgrid" version="9.9.0" targetFramework="net461" />
   <package id="structuremap" version="3.1.6.186" targetFramework="net452" />
   <package id="StructureMap.MVC5" version="3.0.4.125" targetFramework="net452" />
diff --git a/README.md b/README.md
index 07a29d9..f213efe 100644
--- a/README.md
+++ b/README.md
@@ -1,12 +1,8 @@
-# PortalCMS (1.3.4) (January 2018)
-- PortalCMS is a free and open source developer framework built in C# MVC featuring a powerful integrated page builder with inline editing, drag and drop and content management.
+# PortalCMS (January 2018)
+- PortalCMS is a fork of https://github.com/tommcclean/PortalCMS - a free and open source developer framework built in C# MVC featuring a powerful integrated page builder with inline editing, drag and drop and content management.
 - PortalCMS gives you a fully featured .NET MVC website out of the box which can be easily extended by web developers.
 - Non technical users can create unlimited pages and blog posts without writing any code using the Page Builder.
 
-### Learn More
-- Test Drive PortalCMS using our Online Demo: [Online Demo](https://portalcmsdemo.azurewebsites.net)
-- If you want to see an example website built with PortalCMS, check out my [Personal Website](http://tommcclean.me)
-
 ### Why Choose Portal CMS?
 - To build a modern website that is good looking, standards compliant and easy to use with minimal effort and time.
 - Get the ability to update your website from any device and any location quickly. 
@@ -15,3 +11,8 @@
 - Easy to setup with no scripts or installations to run, everything Portal CMS needs is setup automatically.
 - To give technical users the ability to add bespoke functionality quickly.
 - To give non technical users the ability to edit the website in real time.
+
+### Changes
+- Updated to use EF Identity framework (major upgrade)
+- Profile image preview on upload
+- Currently working on Stripe payment gateway integration...