diff --git a/DeveloperTools/Controllers/ContentTypeAnalyzerController.cs b/DeveloperTools/Controllers/ContentTypeAnalyzerController.cs
index 43f2214..1f7ec06 100644
--- a/DeveloperTools/Controllers/ContentTypeAnalyzerController.cs
+++ b/DeveloperTools/Controllers/ContentTypeAnalyzerController.cs
@@ -1,14 +1,305 @@
-using System.Web.Mvc;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Web.Mvc;
+using DeveloperTools.Models;
 using EPiServer.DataAbstraction;
-using EPiServer.ServiceLocation;
+using EPiServer.DataAbstraction.RuntimeModel;
+using EPiServer.Security;
 
 namespace DeveloperTools.Controllers
 {
     public class ContentTypeAnalyzerController : DeveloperToolsController
     {
+        private readonly ContentTypeModelRepository _contentTypeModelRepository;
+
+        public ContentTypeAnalyzerController(ContentTypeModelRepository contentTypeModelRepository)
+        {
+            _contentTypeModelRepository = contentTypeModelRepository ?? throw new ArgumentNullException(nameof(contentTypeModelRepository));
+        }
+
         public ActionResult Index()
         {
-            return View(ServiceLocator.Current.GetInstance<ContentTypeModelRepository>().List());
+            var contentTypeModels = _contentTypeModelRepository.List();
+            var model = new ContentTypeAnalyzerModel
+            {
+                ContentTypes = CreateContentTypeModels(contentTypeModels)
+            };
+            return View(model);
+        }
+
+        private IEnumerable<ContentTypeAnalyzerModel.ContentTypeModel> CreateContentTypeModels(IEnumerable<ContentTypeModel> contentTypeModels)
+        {
+            foreach (var contentTypeModel in contentTypeModels)
+            {
+                yield return CreateContentTypeModel(contentTypeModel);
+                foreach (var propertyDefinitionModel in contentTypeModel.PropertyDefinitionModels)
+                {
+                    yield return CreateContentTypeModel(propertyDefinitionModel, contentTypeModel);
+                }
+            }
+        }
+
+        private ContentTypeAnalyzerModel.ContentTypeModel CreateContentTypeModel(ContentTypeModel contentTypeModel)
+        {
+            var hasConflict = contentTypeModel.State == SynchronizationStatus.Conflict;
+            return new ContentTypeAnalyzerModel.ContentTypeModel
+            {
+                Type = "Content Type Model",
+                DisplayName = contentTypeModel.DisplayName,
+                Name = contentTypeModel.Name,
+                State = contentTypeModel.State.ToString(),
+                Description = contentTypeModel.Description,
+                HasConflict = contentTypeModel.State == SynchronizationStatus.Conflict,
+                Conflicts = FindConflicts(contentTypeModel, hasConflict)
+            };
+        }
+
+        private IEnumerable<ContentTypeAnalyzerModel.ConflictModel> FindConflicts(ContentTypeModel model, bool hasConflict)
+        {
+            if (!hasConflict) yield break;
+
+            var contentType = model.ExistingContentType;
+
+            if (!(model.ModelType == null
+                  || model.ModelType.AssemblyQualifiedName == contentType.ModelTypeString))
+            {
+                yield return new ContentTypeAnalyzerModel.ConflictModel
+                {
+                    Name = "Model type",
+                    ContentTypeModelValue = model.ModelType.ToString(),
+                    ContentTypeValue = contentType.ModelTypeString
+                };
+            }
+
+            if (!string.Equals(model.Name, contentType.Name))
+            {
+                yield return new ContentTypeAnalyzerModel.ConflictModel
+                {
+                    Name = "Name",
+                    ContentTypeModelValue = model.Name,
+                    ContentTypeValue = contentType.Name
+                };
+            }
+
+            if (!(string.IsNullOrEmpty(model.Description)
+                  || string.Equals(model.Description, contentType.Description)))
+            {
+                yield return new ContentTypeAnalyzerModel.ConflictModel
+                {
+                    Name = "Description",
+                    ContentTypeModelValue = model.Description,
+                    ContentTypeValue = contentType.Description
+                };
+            }
+
+            if (!(string.IsNullOrEmpty(model.DisplayName)
+                  || string.Equals(model.DisplayName, contentType.DisplayName)))
+            {
+                yield return new ContentTypeAnalyzerModel.ConflictModel
+                {
+                    Name = "Display name",
+                    ContentTypeModelValue = model.DisplayName,
+                    ContentTypeValue = contentType.DisplayName
+                };
+            }
+
+            if (!(!model.Order.HasValue
+                  || model.Order.Value == contentType.SortOrder))
+            {
+                yield return new ContentTypeAnalyzerModel.ConflictModel
+                {
+                    Name = "Sort order",
+                    ContentTypeModelValue = model.Order?.ToString(),
+                    ContentTypeValue = contentType.SortOrder.ToString()
+                };
+            }
+
+            if (!(!model.Guid.HasValue
+                  || !(model.Guid.Value != contentType.GUID)))
+            {
+                yield return new ContentTypeAnalyzerModel.ConflictModel
+                {
+                    Name = "GUID",
+                    ContentTypeModelValue = model.Guid?.ToString(),
+                    ContentTypeValue = contentType.GUID.ToString()
+                };
+            }
+
+            if (!(!model.AvailableInEditMode.HasValue
+                  || model.AvailableInEditMode.Value == contentType.IsAvailable))
+            {
+                yield return new ContentTypeAnalyzerModel.ConflictModel
+                {
+                    Name = "Availability",
+                    ContentTypeModelValue = model.AvailableInEditMode?.ToString(),
+                    ContentTypeValue = contentType.IsAvailable.ToString()
+                };
+            }
+
+            if (!AclInSynch(model, contentType))
+            {
+                yield return new ContentTypeAnalyzerModel.ConflictModel
+                {
+                    Name = "ACL",
+                    ContentTypeModelValue = AclToString(model.ACL),
+                    ContentTypeValue = AclToString(contentType.ACL)
+                };
+            }
+        }
+
+        private static bool AclInSynch(ContentTypeModel model, ContentType contentType)
+        {
+            if (contentType.ACL == null && model.ACL == null) return true;
+
+            if (contentType.ACL != null && model.ACL != null)
+            {
+                return contentType.ACL.EntriesEquals(
+                    model.ACL ?? new AccessControlList
+                    {
+                        new AccessControlEntry(EveryoneRole.RoleName, AccessLevel.Create)
+                    });
+            }
+
+            return false;
+        }
+
+        private static string AclToString(AccessControlList acl)
+        {
+            if (acl == null) return string.Empty;
+            var sb = new StringBuilder();
+            foreach (var entry in acl.Entries)
+            {
+                sb.Append($"{entry.Name}, {entry.Access}, {entry.EntityType}; ");
+            }
+            return sb.ToString().TrimEnd().TrimEnd(';');
+        }
+
+        private ContentTypeAnalyzerModel.ContentTypeModel CreateContentTypeModel(PropertyDefinitionModel propertyDefinitionModel, ContentTypeModel contentTypeModel)
+        {
+            var hasConflicts = propertyDefinitionModel.State == SynchronizationStatus.Conflict;
+            return new ContentTypeAnalyzerModel.ContentTypeModel
+            {
+                Type = "Property Type Model",
+                DisplayName = propertyDefinitionModel.DisplayName,
+                Name = $"{contentTypeModel.Name}-{propertyDefinitionModel.Name}",
+                State = propertyDefinitionModel.State.ToString(),
+                Description = propertyDefinitionModel.Description,
+                HasConflict = hasConflicts,
+                Conflicts = FindConflicts(propertyDefinitionModel, hasConflicts)
+            };
+        }
+
+        private IEnumerable<ContentTypeAnalyzerModel.ConflictModel> FindConflicts(PropertyDefinitionModel model, bool hasConflicts)
+        {
+            if(!hasConflicts) yield break;
+
+            var propertyDefinition = model.ExistingPropertyDefinition;
+
+            if (!string.IsNullOrEmpty(model.TabName)
+                && (TabIsNotPersisted(propertyDefinition.Tab) || !string.Equals(model.TabName, propertyDefinition.Tab.Name)))
+            {
+                yield return new ContentTypeAnalyzerModel.ConflictModel
+                {
+                    Name = "Tab name",
+                    ContentTypeModelValue = model.TabName,
+                    ContentTypeValue = propertyDefinition.Tab.Name
+                };
+            }
+
+            if (!string.IsNullOrEmpty(model.Name)
+                && !string.Equals(model.Name, propertyDefinition.Name))
+            {
+                yield return new ContentTypeAnalyzerModel.ConflictModel
+                {
+                    Name = "Name",
+                    ContentTypeModelValue = model.Name,
+                    ContentTypeValue = propertyDefinition.Name
+                };
+            }
+
+            if (!string.IsNullOrEmpty(model.Description)
+                && !string.Equals(model.Description, propertyDefinition.HelpText))
+            {
+                yield return new ContentTypeAnalyzerModel.ConflictModel
+                {
+                    Name = "Description (help text)",
+                    ContentTypeModelValue = model.Description,
+                    ContentTypeValue = propertyDefinition.HelpText
+                };
+            }
+
+            if (!string.IsNullOrEmpty(model.DisplayName)
+                && !string.Equals(model.DisplayName, propertyDefinition.EditCaption))
+            {
+                yield return new ContentTypeAnalyzerModel.ConflictModel
+                {
+                    Name = "Display name (edit caption)",
+                    ContentTypeModelValue = model.DisplayName,
+                    ContentTypeValue = propertyDefinition.Tab.Name
+                };
+            }
+
+            if ((model.CultureSpecific ?? false) != propertyDefinition.LanguageSpecific)
+            {
+                yield return new ContentTypeAnalyzerModel.ConflictModel
+                {
+                    Name = "Culture specific (language specific)",
+                    ContentTypeModelValue = model.CultureSpecific?.ToString(),
+                    ContentTypeValue = propertyDefinition.LanguageSpecific.ToString()
+                };
+            }
+
+            if (model.Required.HasValue
+                && model.Required.Value != propertyDefinition.Required)
+            {
+                yield return new ContentTypeAnalyzerModel.ConflictModel
+                {
+                    Name = "Required",
+                    ContentTypeModelValue = model.Required?.ToString(),
+                    ContentTypeValue = propertyDefinition.Required.ToString()
+                };
+            }
+
+            if (model.Searchable.HasValue
+                && model.Searchable.Value != propertyDefinition.Searchable)
+            {
+                yield return new ContentTypeAnalyzerModel.ConflictModel
+                {
+                    Name = "Searchable",
+                    ContentTypeModelValue = model.Searchable?.ToString(),
+                    ContentTypeValue = propertyDefinition.Searchable.ToString()
+                };
+            }
+
+            if (model.AvailableInEditMode.HasValue
+                && model.AvailableInEditMode.Value != propertyDefinition.DisplayEditUI)
+            {
+                yield return new ContentTypeAnalyzerModel.ConflictModel
+                {
+                    Name = "Available in edit mode (display edit UI)",
+                    ContentTypeModelValue = model.AvailableInEditMode?.ToString(),
+                    ContentTypeValue = propertyDefinition.DisplayEditUI.ToString()
+                };
+            }
+
+            if (model.Order.HasValue
+                && model.Order.Value != propertyDefinition.FieldOrder)
+            {
+                yield return new ContentTypeAnalyzerModel.ConflictModel
+                {
+                    Name = "Field order",
+                    ContentTypeModelValue = model.Order?.ToString(),
+                    ContentTypeValue = propertyDefinition.FieldOrder.ToString()
+                };
+            }
+        }
+
+        private static bool TabIsNotPersisted(TabDefinition tab)
+        {
+            if (tab != null)
+                return tab.ID == -1;
+            return true;
         }
     }
 }
diff --git a/DeveloperTools/DeveloperTools.csproj b/DeveloperTools/DeveloperTools.csproj
index ee94275..2814a90 100644
--- a/DeveloperTools/DeveloperTools.csproj
+++ b/DeveloperTools/DeveloperTools.csproj
@@ -220,6 +220,7 @@
     <Compile Include="Core\DeveloperMenuProvider.cs" />
     <Compile Include="Core\EnumerableExtensions.cs" />
     <Compile Include="Models\AssembliesModel.cs" />
+    <Compile Include="Models\ContentTypeAnalyzerModel.cs" />
     <Compile Include="Models\ExtractedModuleInfo.cs" />
     <Compile Include="Models\ModuleDependency.cs" />
     <Compile Include="Models\ModuleDependencyViewModel.cs" />
@@ -238,7 +239,9 @@
     <None Include="app.config" />
     <Compile Include="Controllers\ModuleDependenciesController.cs" />
     <None Include="EPiServer.DeveloperTools.zip" />
-    <None Include="modules\_protected\EPiServer.DeveloperTools\Views\ContentTypeAnalyzer\Index.aspx" />
+    <None Include="modules\_protected\EPiServer.DeveloperTools\Views\ContentTypeAnalyzer\Index.aspx">
+      <SubType>ASPXCodeBehind</SubType>
+    </None>
     <None Include="modules\_protected\EPiServer.DeveloperTools\Views\Routes\Index.aspx" />
     <None Include="modules\_protected\EPiServer.DeveloperTools\Views\RemoteEvent\Index.aspx">
       <SubType>ASPXCodeBehind</SubType>
diff --git a/DeveloperTools/Models/ContentTypeAnalyzerModel.cs b/DeveloperTools/Models/ContentTypeAnalyzerModel.cs
new file mode 100644
index 0000000..d274009
--- /dev/null
+++ b/DeveloperTools/Models/ContentTypeAnalyzerModel.cs
@@ -0,0 +1,38 @@
+using System.Collections.Generic;
+using System.Linq;
+
+namespace DeveloperTools.Models
+{
+    public class ContentTypeAnalyzerModel
+    {
+        public ContentTypeAnalyzerModel()
+        {
+            ContentTypes = Enumerable.Empty<ContentTypeModel>();
+        }
+
+        public IEnumerable<ContentTypeModel> ContentTypes { get; set; }
+
+        public class ContentTypeModel
+        {
+            public ContentTypeModel()
+            {
+                Conflicts = Enumerable.Empty<ConflictModel>();
+            }
+
+            public string Type { get; set; }
+            public string DisplayName { get; set; }
+            public string Name { get; set; }
+            public string State { get; set; }
+            public bool HasConflict { get; set; }
+            public string Description { get; set; }
+            public IEnumerable<ConflictModel> Conflicts { get; set; }
+        }
+
+        public class ConflictModel
+        {
+            public string Name { get; set; }
+            public string ContentTypeModelValue { get; set; }
+            public string ContentTypeValue { get; set; }
+        }
+    }
+}
\ No newline at end of file
diff --git a/DeveloperTools/modules/_protected/EPiServer.DeveloperTools/Views/ContentTypeAnalyzer/Index.aspx b/DeveloperTools/modules/_protected/EPiServer.DeveloperTools/Views/ContentTypeAnalyzer/Index.aspx
index 2b713eb..a99487f 100644
--- a/DeveloperTools/modules/_protected/EPiServer.DeveloperTools/Views/ContentTypeAnalyzer/Index.aspx
+++ b/DeveloperTools/modules/_protected/EPiServer.DeveloperTools/Views/ContentTypeAnalyzer/Index.aspx
@@ -1,4 +1,4 @@
-<%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage<IEnumerable<ContentTypeModel>>" MasterPageFile="../Shared/DeveloperTools.Master" %>
+<%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage<DeveloperTools.Models.ContentTypeAnalyzerModel>" MasterPageFile="../Shared/DeveloperTools.Master" %>
  <%@ Import Namespace="EPiServer.DataAbstraction.RuntimeModel" %>
 
 
@@ -17,29 +17,29 @@
             <th align="left">DisplayName</th>
             <th align="left">Name</th>
             <th align="left">SynchronizationStatus</th>
+            <th align="left">Conflicts</th>
             <th align="left">Description</th>
 
         </tr>
     </thead>
     <tbody>
-<% foreach (var m in Model){%>
+<% foreach (var m in Model.ContentTypes){%>
     <tr>
-        <td>Content Type Model</td>
+        <td><%:m.Type%></td>
         <td><%:m.DisplayName%></td>
         <td><%:m.Name%></td>
-        <td <%: (m.State == EPiServer.DataAbstraction.RuntimeModel.SynchronizationStatus.Conflict ? "bgcolor=red":"")%>><%:m.State%></td>
+        <td <%:m.HasConflict ? "bgcolor=red":""%>><%:m.State%></td>
+        <td>
+            <% if(m.HasConflict){%>
+            <ul>
+            <% foreach (var c in m.Conflicts){%>
+                <li><%:c.Name %> - Code = "<%:c.ContentTypeModelValue %>" vs DB = "<%:c.ContentTypeValue %>"</li>
+            <%} %>
+            </ul>
+            <%} %>
+        </td>
         <td><%:m.Description%></td>
     </tr>
-
-    <% foreach (var pd in m.PropertyDefinitionModels){%>
-     <tr>
-        <td>Property Type Model</td>
-        <td><%:pd.DisplayName%></td>
-        <td><%:m.Name%>-<%:pd.Name%></td>
-        <td <%: (pd.State == EPiServer.DataAbstraction.RuntimeModel.SynchronizationStatus.Conflict ? "bgcolor=red":"")%>><%:pd.State%></td>
-        <td><%:pd.Description%></td>
-    </tr>
-    <%}%>
   <%}%>
   </tbody>
 </table>