diff --git a/ANAConversationPlatform/Attributes/BasicAuthenticationAttribute.cs b/ANAConversationPlatform/Attributes/BasicAuthenticationAttribute.cs
new file mode 100644
index 0000000..b301fcd
--- /dev/null
+++ b/ANAConversationPlatform/Attributes/BasicAuthenticationAttribute.cs
@@ -0,0 +1,38 @@
+using ANAConversationPlatform.Helpers;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace ANAConversationPlatform.Attributes
+{
+    public class BasicAuthenticationAttribute : ActionFilterAttribute
+    {
+        public override async Task OnActionExecutionAsync(ActionExecutingContext context, ActionExecutionDelegate next)
+        {
+            if (Utils.BasicAuth == null || string.IsNullOrWhiteSpace(Utils.BasicAuth.APIKey) || string.IsNullOrWhiteSpace(Utils.BasicAuth.APISecret))
+            {
+                await next();
+                return;
+            }
+
+            var headers = context.HttpContext.Request.Headers;
+            var authHeader = headers["Authorization"].FirstOrDefault();
+            if (string.IsNullOrWhiteSpace(authHeader))
+            {
+                context.HttpContext.Response.StatusCode = 401;
+                return;
+            }
+            var savedAuthBase64 = Utils.BasicAuth.GetBase64();
+            var givenAuthBase64 = authHeader.Split(new[] { " " }, StringSplitOptions.RemoveEmptyEntries).Skip(1).FirstOrDefault()?.Trim();
+            if (givenAuthBase64 != savedAuthBase64)
+            {
+                context.HttpContext.Response.StatusCode = 401;
+                return;
+            }
+            await next();
+        }
+    }
+}
diff --git a/ANAConversationPlatform/Controllers/ActivityController.cs b/ANAConversationPlatform/Controllers/ActivityController.cs
index e21cf0b..73f7011 100644
--- a/ANAConversationPlatform/Controllers/ActivityController.cs
+++ b/ANAConversationPlatform/Controllers/ActivityController.cs
@@ -1,24 +1,17 @@
 using Microsoft.AspNetCore.Mvc;
 using ANAConversationPlatform.Models.Activity;
 using ANAConversationPlatform.Helpers;
+using System.Threading.Tasks;
 
 namespace ANAConversationPlatform.Controllers
 {
     [Produces("application/json")]
     public class ActivityController : Controller
     {
-        [HttpGet]
-        public ActionResult Summary(string nodeIds)
-        {
-            var nodeIdList = nodeIds.Split(',');
-
-            return Ok(new { Message = "Done" });
-        }
-
         [HttpPost]
-        public ActionResult Track([FromBody]ChatActivityEvent activityEvent)
+        public async Task<ActionResult> Track([FromBody]ChatActivityEvent activityEvent)
         {
-            MongoHelper.InsertActivityEvent(activityEvent);
+            await MongoHelper.InsertActivityEventAsync(activityEvent);
             return Ok();
         }
     }
diff --git a/ANAConversationPlatform/Controllers/AgentChatController.cs b/ANAConversationPlatform/Controllers/AgentChatController.cs
index c5e1ade..0b9b67d 100644
--- a/ANAConversationPlatform/Controllers/AgentChatController.cs
+++ b/ANAConversationPlatform/Controllers/AgentChatController.cs
@@ -35,7 +35,7 @@ public async Task<ActionResult> UserInput(string CHAT_USER_ID, string CHAT_USER_
         public async Task<ActionResult> SubmitHistory([FromBody]SubmitChatHistoryModel history)
         {
             if (string.IsNullOrWhiteSpace(history.CHAT_USER_ID) || string.IsNullOrWhiteSpace(history.CHAT_USER_TOKEN))
-                return BadRequest("Empty chat user id or chat user token");
+                return BadRequest(new { Message = "Empty chat user id or chat user token" });
             if (history == null || history.HISTORY == null || history.HISTORY.Count <= 0)
                 return Ok();
 
diff --git a/ANAConversationPlatform/Controllers/ConversationController.cs b/ANAConversationPlatform/Controllers/ConversationController.cs
index 60f6232..28c205a 100644
--- a/ANAConversationPlatform/Controllers/ConversationController.cs
+++ b/ANAConversationPlatform/Controllers/ConversationController.cs
@@ -1,13 +1,15 @@
 using System.Collections.Generic;
 using Microsoft.AspNetCore.Mvc;
 using ANAConversationPlatform.Helpers;
-using System.Diagnostics;
-using MongoDB.Bson;
-using Newtonsoft.Json;
 using ANAConversationPlatform.Models;
 using ANAConversationPlatform.Models.Sections;
 using Microsoft.Extensions.Logging;
 using static ANAConversationPlatform.Helpers.Constants;
+using System.Threading.Tasks;
+using MongoDB.Bson;
+using MongoDB.Bson.Serialization;
+using System.IO;
+using ANAConversationPlatform.Attributes;
 
 namespace ANAConversationPlatform.Controllers
 {
@@ -22,19 +24,30 @@ public ConversationController(ILogger<ConversationController> log)
         }
 
         [HttpGet]
-        public ActionResult Chat()
+        public async Task<ActionResult> Chat([FromQuery]string projectId = null, [FromQuery]string projectName = null, [FromQuery]bool enableAgentChat = true)
         {
             try
             {
-                var chatNodes = MongoHelper.RetrieveRecordsFromChatNode();
+                if (string.IsNullOrWhiteSpace(projectId) && string.IsNullOrWhiteSpace(projectName))
+                    return BadRequest(new { Message = "Either project id or project name has to be provided" });
+
+                ChatFlowPack chatFlowPack = null;
+                if (!string.IsNullOrWhiteSpace(projectId))
+                    chatFlowPack = await MongoHelper.GetChatFlowPackAsync(projectId);
+                else if (!string.IsNullOrWhiteSpace(projectName))
+                    chatFlowPack = await MongoHelper.GetChatFlowPackByProjectNameAsync(projectName);
+
+                if (chatFlowPack == null)
+                    return BadRequest(new { Message = "No chat flow found by the given project id or name" });
+
+                var chatNodes = ChatFlowBuilder.Build(chatFlowPack);
                 if (chatNodes == null || chatNodes.Count == 0)
                     return Ok(new object[] { });
 
-                return Json(chatNodes, new JsonSerializerSettings()
-                {
-                    NullValueHandling = NullValueHandling.Ignore,
-                    Converters = new List<JsonConverter> { new CustomStringEnumConverter() }
-                });
+                if (enableAgentChat)
+                    AddAgentChatNodes(chatNodes);
+
+                return Json(chatNodes, PublishJsonSettings);
             }
             catch (System.Exception ex)
             {
@@ -44,20 +57,49 @@ public ActionResult Chat()
         }
 
         [HttpGet]
-        public ActionResult RefreshContent()
+        public ActionResult HybridChat()
         {
-            MongoHelper.RefreshContentInMemory();
-            return Ok(new { Message = "Done" });
+            return RedirectToAction(nameof(Chat));
         }
 
-        [HttpGet]
-        public ActionResult HybridChat()
+        [Produces("text/plain"), HttpPost, BasicAuthentication]
+        public async Task<ActionResult> SaveChatFlow()
         {
             try
             {
-                var chatNodes = MongoHelper.RetrieveRecordsFromChatNode();
+                ChatFlowPack req = null;
+                using (var s = new StreamReader(Request.Body))
+                    req = BsonSerializer.Deserialize<ChatFlowPack>(s.ReadToEnd());
+
+                if (req == null)
+                    return BadRequest(new { Message = "No chat flow received to save!" });
+
+                var saved = await MongoHelper.SaveChatFlowAsync(req);
+                if (saved)
+                    return Content(new { Message = "Chat flow saved", Data = req }.ToJson(), "text/plain");
+            }
+            catch (System.Exception ex)
+            {
+                return BadRequest(new { Message = "Unable to save chat flow!. Ex: " + ex.Message });
+            }
+            return BadRequest(new { Message = "Unable to save chat flow!" });
+        }
+
+        [Produces("text/plain"), HttpGet, BasicAuthentication]
+        public async Task<ActionResult> FetchChatFlow([FromQuery] string projectId)
+        {
+            if (string.IsNullOrWhiteSpace(projectId))
+                return BadRequest(new { Message = "Project Id is not provided!" });
+
+            var proj = await MongoHelper.GetChatFlowPackAsync(projectId);
+            if (proj != null)
+                return Content(new { Message = "Fetched", Data = proj }.ToJson(), "text/plain");
+            return BadRequest(new { Message = "Project with the given id was not found or could not be retrieved!" });
+        }
 
-                chatNodes.AddRange(new[]
+        private void AddAgentChatNodes(List<ChatNode> chatNodes)
+        {
+            chatNodes.AddRange(new[]
                 {
                     new ChatNode("INIT_CHAT_NODE")
                     {
@@ -115,21 +157,6 @@ public ActionResult HybridChat()
                         VariableName = "TEXT"
                     }
                 });
-
-                if (chatNodes == null || chatNodes.Count == 0)
-                    return Ok(new object[] { });
-
-                return Json(chatNodes, new JsonSerializerSettings()
-                {
-                    NullValueHandling = NullValueHandling.Ignore,
-                    Converters = new List<JsonConverter> { new CustomStringEnumConverter() }
-                });
-            }
-            catch (System.Exception ex)
-            {
-                _log.LogError(new EventId((int)LoggerEventId.HYBRID_CHAT_ACTION_ERROR), ex, ex.Message);
-                return StatusCode(500, new { Message = ex.Message });
-            }
         }
     }
 }
\ No newline at end of file
diff --git a/ANAConversationPlatform/Controllers/ProjectController.cs b/ANAConversationPlatform/Controllers/ProjectController.cs
new file mode 100644
index 0000000..3d14913
--- /dev/null
+++ b/ANAConversationPlatform/Controllers/ProjectController.cs
@@ -0,0 +1,32 @@
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc;
+using ANAConversationPlatform.Helpers;
+using ANAConversationPlatform.Models;
+using System.Collections.Generic;
+using ANAConversationPlatform.Attributes;
+
+namespace ANAConversationPlatform.Controllers
+{
+    [Produces("application/json"), BasicAuthentication]
+    public class ProjectController : Controller
+    {
+        [HttpGet]
+        public async Task<ActionResult> List()
+        {
+            var projs = await MongoHelper.GetProjectsAsync();
+            if (projs != null)
+                return Json(new { Message = "Projects list", Data = projs });
+            return BadRequest(new { Message = "Unable to list the projects!" });
+        }
+
+        [HttpPost]
+        public ActionResult Save([FromBody] List<ANAProject> projects)
+        {
+            var projs = MongoHelper.SaveProjects(projects);
+            if (projs != null)
+                return Ok(new { Message = "Saved", Data = projects });
+
+            return BadRequest(new { Message = "Unable to save!" });
+        }
+    }
+}
\ No newline at end of file
diff --git a/ANAConversationPlatform/Controllers/ServicesController.cs b/ANAConversationPlatform/Controllers/ServicesController.cs
index ee1934d..1278962 100644
--- a/ANAConversationPlatform/Controllers/ServicesController.cs
+++ b/ANAConversationPlatform/Controllers/ServicesController.cs
@@ -18,21 +18,21 @@ public ServicesController(IHostingEnvironment env)
         [HttpPost]
         public ActionResult ReceiveFile(string fileName)
         {
-            if (string.IsNullOrWhiteSpace(fileName)) return BadRequest("fileName cannot be empty");
+            if (string.IsNullOrWhiteSpace(fileName)) return BadRequest(new { Message = "fileName cannot be empty" });
 
             fileName = Path.GetFileNameWithoutExtension(fileName) + "-" + Guid.NewGuid() + Path.GetExtension(fileName);
 
             using (var fileStream = Request.Body)
             {
                 if (fileStream == null)
-                    return BadRequest("Unable to read file content");
+                    return BadRequest(new { Message = "Unable to read file content" });
 
                 var fullFileName = Path.Combine(_env.WebRootPath, Constants.CHAT_MEDIA_FOLDER_NAME, fileName);
                 var done = FileSaveHelper.Save(fullFileName, fileStream);
                 if (done)
                     return Ok(new { Url = $"{Request.Scheme}://{Request.Host}/{Constants.CHAT_MEDIA_FOLDER_NAME}/{fileName}" });
                 else
-                    return StatusCode(500, "Unable to save received file"); 
+                    return StatusCode(500, "Unable to save received file");
             }
         }
     }
diff --git a/ANAConversationPlatform/Controllers/StudioDistController.cs b/ANAConversationPlatform/Controllers/StudioDistController.cs
index 4e715a3..51d0135 100644
--- a/ANAConversationPlatform/Controllers/StudioDistController.cs
+++ b/ANAConversationPlatform/Controllers/StudioDistController.cs
@@ -29,7 +29,7 @@ public ActionResult Latest()
                     });
                 }
             }
-            return BadRequest("Studio Distribution Status Unknown");
+            return BadRequest(new { Message = "Studio Distribution Status Unknown" });
         }
 
         [HttpGet]
diff --git a/ANAConversationPlatform/Helpers/ChatFlowBuilder.cs b/ANAConversationPlatform/Helpers/ChatFlowBuilder.cs
new file mode 100644
index 0000000..8421d86
--- /dev/null
+++ b/ANAConversationPlatform/Helpers/ChatFlowBuilder.cs
@@ -0,0 +1,143 @@
+using MongoDB.Driver;
+using ANAConversationPlatform.Models;
+using ANAConversationPlatform.Models.Sections;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using System.Collections.Concurrent;
+using Microsoft.Extensions.Logging;
+using static ANAConversationPlatform.Helpers.Constants;
+
+namespace ANAConversationPlatform.Helpers
+{
+    public static class ChatFlowBuilder
+    {
+        public static ILogger Logger { get; set; }
+
+        public static List<ChatNode> Build(ChatFlowPack chatFlow)
+        {
+            try
+            {
+                var filter = Builders<ChatFlowPack>.Filter;
+
+                var nodesList = new ConcurrentBag<ChatNode>(chatFlow.ChatNodes);
+                var content = new ConcurrentBag<BaseContent>(chatFlow.ChatContent);
+                Parallel.ForEach(nodesList, chatNode =>
+                {
+                    try
+                    {
+                        foreach (Section section in chatNode.Sections)
+                            FillSectionWithContent(section, content);
+                        foreach (Button button in chatNode.Buttons)
+                            button.ButtonText = content.GetFor(button)?.ButtonText;
+                    }
+                    catch (Exception ex)
+                    {
+                        Logger.LogError(new EventId((int)LoggerEventId.MONGO_HELPER_ERROR), ex, "RetrieveRecordsFromChatNode Error: {0}", ex.Message);
+                    }
+                });
+
+                var startNode = nodesList.FirstOrDefault(x => x.IsStartNode);
+                if (startNode != null) //If start chat node is present, move it up
+                {
+                    var result = nodesList.Where(x => x != startNode).ToList();
+                    result.Insert(0, startNode);
+                    return result;
+                }
+                return nodesList.ToList();
+            }
+            catch (Exception ex)
+            {
+                Logger.LogError(new EventId((int)LoggerEventId.MONGO_HELPER_ERROR), ex, "RetrieveRecordsFromChatNode Error: {0}", ex.Message);
+            }
+            return null;
+        }
+
+        private static readonly Random rand = new Random();
+        private static void FillSectionWithContent(Section emptySection, ConcurrentBag<BaseContent> contents)
+        {
+            switch (emptySection.SectionType)
+            {
+                case SectionTypeEnum.Image:
+                case SectionTypeEnum.Gif:
+                    var imgSection = emptySection as ImageSection;
+                    var imgContent = contents.GetFor(imgSection) as TitleCaptionSectionContent;
+                    if (imgContent != null)
+                    {
+                        imgSection.Title = imgContent.Title;
+                        imgSection.Caption = imgContent.Caption;
+                    }
+                    break;
+
+                case SectionTypeEnum.Text:
+                    var textSection = emptySection as TextSection;
+                    var textContent = contents.GetFor(textSection) as TextSectionContent;
+                    if (textContent != null)
+                    {
+                        textSection.Text = textContent.SectionText;
+                        if (textSection.DelayInMs == 0)
+                            textSection.DelayInMs = Math.Min(Utils.Settings.MaxCapTimeTakenToType, textSection.Text.Length * (Utils.Settings.BaseTimeTakenToTypePerChar + rand.Next(0, Utils.Settings.VariableTimeTakenToTypePerChar)));
+                    }
+                    break;
+
+                case SectionTypeEnum.Audio:
+                    var audioSection = emptySection as AudioSection;
+                    var audioContent = contents.GetFor(audioSection) as TitleCaptionSectionContent;
+                    if (audioContent != null)
+                    {
+                        audioSection.Title = audioContent.Title;
+                        audioSection.Caption = audioContent.Caption;
+                    }
+                    break;
+
+                case SectionTypeEnum.Video:
+                    var videoSection = emptySection as VideoSection;
+                    var videoContent = contents.GetFor(videoSection) as TitleCaptionSectionContent;
+                    if (videoContent != null)
+                    {
+                        videoSection.Title = videoContent.Title;
+                        videoSection.Caption = videoContent.Caption;
+                    }
+                    break;
+
+                case SectionTypeEnum.EmbeddedHtml:
+                    var embeddedHtmlSection = emptySection as EmbeddedHtmlSection;
+                    var embeddedHtmlContent = contents.GetFor(embeddedHtmlSection) as TitleCaptionSectionContent;
+                    if (embeddedHtmlContent != null)
+                    {
+                        embeddedHtmlSection.Title = embeddedHtmlContent.Title;
+                        embeddedHtmlSection.Caption = embeddedHtmlContent.Caption;
+                    }
+                    break;
+
+                case SectionTypeEnum.Carousel:
+                    var carouselSection = emptySection as CarouselSection;
+                    var carContent = contents.GetFor(carouselSection) as TitleCaptionSectionContent;
+                    if (carContent != null)
+                    {
+                        carouselSection.Title = carContent.Title;
+                        carouselSection.Caption = carContent.Caption;
+                    }
+                    if (carouselSection.Items != null)
+                        foreach (var carItem in carouselSection.Items)
+                        {
+                            var content = contents.GetFor(carItem);
+                            if (content != null)
+                            {
+                                carItem.Title = content.Title;
+                                carItem.Caption = content.Caption;
+                            }
+                            if (carItem.Buttons != null)
+                                foreach (var carBtn in carItem.Buttons)
+                                {
+                                    var carBtnContent = contents.GetFor(carBtn);
+                                    carBtn.Text = carBtnContent?.ButtonText;
+                                }
+                        }
+                    break;
+            }
+        }
+
+    }
+}
diff --git a/ANAConversationPlatform/Helpers/Constants.cs b/ANAConversationPlatform/Helpers/Constants.cs
index 10afa70..20d29e9 100644
--- a/ANAConversationPlatform/Helpers/Constants.cs
+++ b/ANAConversationPlatform/Helpers/Constants.cs
@@ -1,4 +1,8 @@
-namespace ANAConversationPlatform.Helpers
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using System.Collections.Generic;
+
+namespace ANAConversationPlatform.Helpers
 {
     public static class Constants
     {
@@ -15,5 +19,11 @@ public enum LoggerEventId
             CHAT_ACTION_ERROR = 7,
             HYBRID_CHAT_ACTION_ERROR = 8,
         }
+
+        public static readonly JsonSerializerSettings PublishJsonSettings = new JsonSerializerSettings
+        {
+            NullValueHandling = NullValueHandling.Ignore,
+            Converters = new List<JsonConverter> { new StringEnumConverter() }
+        };
     }
 }
diff --git a/ANAConversationPlatform/Helpers/Extensions.cs b/ANAConversationPlatform/Helpers/Extensions.cs
index 105f1b9..2c11e3d 100644
--- a/ANAConversationPlatform/Helpers/Extensions.cs
+++ b/ANAConversationPlatform/Helpers/Extensions.cs
@@ -5,47 +5,30 @@
 using System.ComponentModel;
 using System.Linq;
 using System.Reflection;
-using System.Threading.Tasks;
 
 namespace ANAConversationPlatform.Helpers
 {
     public static class Extensions
     {
-        public static Content GetFor(this IEnumerable<Content> contentCollection, ChatNode node)
-        {
-            if (string.IsNullOrWhiteSpace(node.Id)) return null;
-            return contentCollection.FirstOrDefault(x => !string.IsNullOrWhiteSpace(x.NodeId) && x.NodeId == node.Id);
-        }
-
-        public static Content GetFor(this IEnumerable<Content> contentCollection, Section section)
+        public static SectionContent GetFor(this IEnumerable<BaseContent> contentCollection, Section section)
         {
             if (string.IsNullOrWhiteSpace(section._id)) return null;
-            return contentCollection.FirstOrDefault(x => !string.IsNullOrWhiteSpace(x.SectionId) && x.SectionId == section._id);
+            return contentCollection.FirstOrDefault(x => x is SectionContent && !string.IsNullOrWhiteSpace((x as SectionContent).SectionId) && (x as SectionContent).SectionId == section._id) as SectionContent;
         }
-
-        public static Content GetFor(this IEnumerable<Content> contentCollection, CarouselItem carouselItem)
+        public static CarouselItemContent GetFor(this IEnumerable<BaseContent> contentCollection, CarouselItem carouselItem)
         {
             if (string.IsNullOrWhiteSpace(carouselItem._id)) return null;
-            return contentCollection.FirstOrDefault(x => !string.IsNullOrWhiteSpace(x.CarouselItemId) && x.CarouselItemId == carouselItem._id);
+            return contentCollection.FirstOrDefault(x => x is CarouselItemContent && !string.IsNullOrWhiteSpace((x as CarouselItemContent).CarouselItemId) && (x as CarouselItemContent).CarouselItemId == carouselItem._id) as CarouselItemContent;
         }
-
-        public static Content GetFor(this IEnumerable<Content> contentCollection, CarouselButton carouselBtn)
+        public static CarouselButtonContent GetFor(this IEnumerable<BaseContent> contentCollection, CarouselButton carouselBtn)
         {
             if (string.IsNullOrWhiteSpace(carouselBtn._id)) return null;
-            return contentCollection.FirstOrDefault(x => !string.IsNullOrWhiteSpace(x.CarouselButtonId) && x.CarouselButtonId == carouselBtn._id);
+            return contentCollection.FirstOrDefault(x => x is CarouselButtonContent && !string.IsNullOrWhiteSpace((x as CarouselButtonContent).CarouselButtonId) && (x as CarouselButtonContent).CarouselButtonId == carouselBtn._id) as CarouselButtonContent;
         }
-
-        public static Content GetFor(this IEnumerable<Content> contentCollection, Button btn)
-        {
-            if (string.IsNullOrWhiteSpace(btn._id)) return null;
-            return contentCollection.FirstOrDefault(x => !string.IsNullOrWhiteSpace(x.ButtonId) && x.ButtonId == btn._id);
-        }
-        public static Content GetFor(this IEnumerable<Content> contentCollection, Coordinates coordiates)
+        public static ButtonContent GetFor(this IEnumerable<BaseContent> contentCollection, Button btn)
         {
-            if (string.IsNullOrWhiteSpace(coordiates.CoordinateListId)) return null;
-            return contentCollection.FirstOrDefault(x => !string.IsNullOrWhiteSpace(x.ButtonId) && x.ButtonId == coordiates.CoordinateListId);
+            return contentCollection.FirstOrDefault(x => x is ButtonContent && !string.IsNullOrWhiteSpace((x as ButtonContent).ButtonId) && (x as ButtonContent).ButtonId == btn._id) as ButtonContent;
         }
-
         public static string GetDescriptionOrDefault(this Enum value)
         {
             var field = value.GetType().GetField(value.ToString());
@@ -56,7 +39,6 @@ public static string GetDescriptionOrDefault(this Enum value)
             else
                 return value.ToString();
         }
-
         public static T ParseEnum<T>(this string value)
         {
             return (T)Enum.Parse(typeof(T), value, true);
diff --git a/ANAConversationPlatform/Helpers/MongoHelper.cs b/ANAConversationPlatform/Helpers/MongoHelper.cs
index 28e884e..0f99fcd 100644
--- a/ANAConversationPlatform/Helpers/MongoHelper.cs
+++ b/ANAConversationPlatform/Helpers/MongoHelper.cs
@@ -7,12 +7,9 @@
 using ANAConversationPlatform.Models.Settings;
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.Linq;
 using ANAConversationPlatform.Models.Activity;
 using System.Threading.Tasks;
-using System.Collections.Concurrent;
-using ANAConversationPlatform.Controllers;
 using Microsoft.Extensions.Logging;
 using static ANAConversationPlatform.Helpers.Constants;
 
@@ -22,10 +19,53 @@ public static class MongoHelper
     {
         static MongoHelper()
         {
-            ConventionRegistry.Register(typeof(IgnoreExtraElementsConvention).Name, new ConventionPack { new IgnoreExtraElementsConvention(true) }, t => true);
+            #region Initialize Mongo Driver
+            ConventionRegistry.Register(nameof(IgnoreExtraElementsConvention), new ConventionPack { new IgnoreExtraElementsConvention(true) }, t => true);
+            ConventionRegistry.Register(nameof(EnumRepresentationConvention), new ConventionPack { new EnumRepresentationConvention(BsonType.String) }, t => true);
+            if (!BsonClassMap.IsClassMapRegistered(typeof(GifSection)))
+                BsonClassMap.RegisterClassMap<GifSection>();
+
+            if (!BsonClassMap.IsClassMapRegistered(typeof(TextSection)))
+                BsonClassMap.RegisterClassMap<TextSection>();
+
+            if (!BsonClassMap.IsClassMapRegistered(typeof(ImageSection)))
+                BsonClassMap.RegisterClassMap<ImageSection>();
+
+            if (!BsonClassMap.IsClassMapRegistered(typeof(AudioSection)))
+                BsonClassMap.RegisterClassMap<AudioSection>();
+
+            if (!BsonClassMap.IsClassMapRegistered(typeof(VideoSection)))
+                BsonClassMap.RegisterClassMap<VideoSection>();
+
+            if (!BsonClassMap.IsClassMapRegistered(typeof(EmbeddedHtmlSection)))
+                BsonClassMap.RegisterClassMap<EmbeddedHtmlSection>();
+
+            if (!BsonClassMap.IsClassMapRegistered(typeof(CarouselSection)))
+                BsonClassMap.RegisterClassMap<CarouselSection>();
+
+            if (!BsonClassMap.IsClassMapRegistered(typeof(SectionContent)))
+                BsonClassMap.RegisterClassMap<SectionContent>();
+
+            if (!BsonClassMap.IsClassMapRegistered(typeof(TextSectionContent)))
+                BsonClassMap.RegisterClassMap<TextSectionContent>();
+
+            if (!BsonClassMap.IsClassMapRegistered(typeof(TitleCaptionSectionContent)))
+                BsonClassMap.RegisterClassMap<TitleCaptionSectionContent>();
+
+            if (!BsonClassMap.IsClassMapRegistered(typeof(ButtonContent)))
+                BsonClassMap.RegisterClassMap<ButtonContent>();
+
+            if (!BsonClassMap.IsClassMapRegistered(typeof(PrintOTPSection)))
+                BsonClassMap.RegisterClassMap<PrintOTPSection>();
+
+            if (!BsonClassMap.IsClassMapRegistered(typeof(CarouselButtonContent)))
+                BsonClassMap.RegisterClassMap<CarouselButtonContent>();
+
+            if (!BsonClassMap.IsClassMapRegistered(typeof(CarouselItemContent)))
+                BsonClassMap.RegisterClassMap<CarouselItemContent>();
+            #endregion
         }
         public static ILogger Logger { get; set; }
-
         public static DatabaseConnectionSettings Settings { get; set; }
 
         private static MongoClient _chatClient;
@@ -46,278 +86,173 @@ private static IMongoDatabase ChatDB
             }
         }
 
-        private static ConcurrentBag<Content> _contents;
-        private static ConcurrentBag<Content> Contents
+        public static async Task InsertActivityEventAsync(ChatActivityEvent activityEvent)
         {
-            get
+            try
             {
-                if (_contents == null)
-                    _contents = new ConcurrentBag<Content>(GetContentCollection());
-                return _contents;
+                if (activityEvent != null && string.IsNullOrWhiteSpace(activityEvent._id))
+                    activityEvent._id = ObjectId.GenerateNewId().ToString();
+
+                var coll = ChatDB.GetCollection<ChatActivityEvent>(Settings.ActivityEventLogCollectionName);
+                await coll.InsertOneAsync(activityEvent);
+            }
+            catch (Exception ex)
+            {
+                Logger.LogError(new EventId((int)LoggerEventId.MONGO_HELPER_ERROR), ex, "InsertActivityEvent: {0}", ex.Message);
             }
         }
 
-        public static List<Content> GetContentCollection() => ChatDB.GetCollection<Content>(Settings.ContentCollectionName).Find(new BsonDocument()).ToList();
+        public static async Task<List<ANAProject>> GetProjectsAsync()
+        {
+            try
+            {
+                return await ChatDB.GetCollection<ANAProject>(Settings.ProjectsCollectionName).Find(new BsonDocument()).ToListAsync();
+            }
+            catch (Exception ex)
+            {
+                Logger.LogError(new EventId((int)LoggerEventId.MONGO_HELPER_ERROR), ex, "GetProjectsAsync: {0}", ex.Message);
+                return null;
+            }
+        }
 
-        public static void RefreshContentInMemory()
+        public static async Task<ANAProject> GetProjectAsync(string projectId)
         {
-            _contents = new ConcurrentBag<Content>(GetContentCollection());
+            try
+            {
+                return await ChatDB.GetCollection<ANAProject>(Settings.ProjectsCollectionName).Find(x => x._id == projectId).SingleOrDefaultAsync();
+            }
+            catch (Exception ex)
+            {
+                Logger.LogError(new EventId((int)LoggerEventId.MONGO_HELPER_ERROR), ex, "GetProjectAsync: {0}", ex.Message);
+                return null;
+            }
         }
 
-        public static List<ChatNode> RetrieveRecordsFromChatNode()
+        public static async Task<ANAProject> GetProjectByNameAsync(string projectName)
         {
             try
             {
-                if (!Settings.CacheContent)
-                    RefreshContentInMemory();
+                return await ChatDB.GetCollection<ANAProject>(Settings.ProjectsCollectionName).Find(x => x.Name == projectName).SingleOrDefaultAsync();
+            }
+            catch (Exception ex)
+            {
+                Logger.LogError(new EventId((int)LoggerEventId.MONGO_HELPER_ERROR), ex, "GetProjectAsync: {0}", ex.Message);
+                return null;
+            }
+        }
 
-                var nodeTemplateCollection = ChatDB.GetCollection<BsonDocument>(Settings.TemplateCollectionName);
+        public static List<ANAProject> SaveProjects(List<ANAProject> projects)
+        {
+            try
+            {
+                var coll = ChatDB.GetCollection<ANAProject>(Settings.ProjectsCollectionName);
 
-                // Retrieving records, if no/invalid limit is specified then all records are retrieved otherwise records as per specified limit and offset are retrieved
-                var nodeList = nodeTemplateCollection.Find(new BsonDocument()).Project(Builders<BsonDocument>.Projection.Exclude("Sections._t").Exclude("Buttons._t")).ToList();
+                projects = projects.Where(x => x != null).ToList();
 
-                var chatNodes = new ConcurrentBag<ChatNode>();
-                Parallel.ForEach(nodeList, node =>
+                Parallel.ForEach(projects, async proj =>
                 {
                     try
                     {
-                        var chatNode = BsonSerializer.Deserialize<ChatNode>(node);
-
-                        chatNode.Sections = new List<Section>();
-                        chatNode.Buttons = new List<Button>();
-
-                        BsonArray sectionBsonArray = node.GetValue("Sections").AsBsonArray;
-                        foreach (BsonDocument sectionBsonDocument in sectionBsonArray)
+                        if (string.IsNullOrWhiteSpace(proj._id) || await coll.CountAsync(x => x._id == proj._id, new CountOptions { Limit = 1 }) <= 0)
                         {
-                            Section sectObj = GetSection(sectionBsonDocument);
-                            chatNode.Sections.Add(sectObj);
+                            if (string.IsNullOrWhiteSpace(proj._id))
+                                proj._id = ObjectId.GenerateNewId().ToString();
+                            proj.CreatedOn = proj.UpdatedOn = DateTime.UtcNow;
+                            await coll.InsertOneAsync(proj);
+                            await SaveChatFlowAsync(new ChatFlowPack
+                            {
+                                ChatContent = new List<BaseContent>(),
+                                ChatNodes = new List<ChatNode>(),
+                                CreatedOn = DateTime.UtcNow,
+                                UpdatedOn = DateTime.UtcNow,
+                                NodeLocations = new Dictionary<string, LayoutPoint>(),
+                                ProjectId = proj._id,
+                                _id = ObjectId.GenerateNewId().ToString()
+                            });
                         }
-
-                        BsonArray buttonBsonArray = node.GetValue("Buttons").AsBsonArray;
-                        foreach (BsonDocument buttonBsonDocument in buttonBsonArray)
+                        else
                         {
-                            Button btn = BsonSerializer.Deserialize<Button>(buttonBsonDocument);
-                            Content buttonContent = Contents.GetFor(btn);
-                            btn.ButtonName = buttonContent?.ButtonName;
-                            btn.ButtonText = buttonContent?.ButtonText;
-                            chatNode.Buttons.Add(btn);
+                            proj.UpdatedOn = DateTime.UtcNow;
+                            await coll.ReplaceOneAsync(x => x._id == proj._id, proj);
                         }
-
-                        chatNode.FlowId = Settings.TemplateCollectionName;
-                        chatNodes.Add(chatNode);
                     }
                     catch (Exception ex)
                     {
-                        Logger.LogError(new EventId((int)LoggerEventId.MONGO_HELPER_ERROR), ex, "RetrieveRecordsFromChatNode Error: {0}", ex.Message);
+                        Logger.LogError(new EventId((int)LoggerEventId.MONGO_HELPER_ERROR), ex, "SaveProjectsAsync Single: {0}", ex.Message);
                     }
                 });
+                return projects;
 
-                var startNode = chatNodes.FirstOrDefault(x => x.IsStartNode);
-                if (startNode != null) //If start chat node is present, move it up
-                {
-                    var result = chatNodes.Where(x => x != startNode).ToList();
-                    result.Insert(0, startNode);
-                    return result;
-                }
-                return chatNodes.ToList();
+                //if (string.IsNullOrWhiteSpace(project._id))
+                //    project._id = ObjectId.GenerateNewId().ToString();
+
+                //if (coll.Count(x => x._id == project._id, new CountOptions { Limit = 1 }) > 0)
+                //{
+                //    project.UpdatedOn = DateTime.UtcNow;
+                //    await coll.ReplaceOneAsync(x => x._id == project._id, project);
+                //    return project;
+                //}
+
+                //project.CreatedOn = project.UpdatedOn = DateTime.UtcNow;
+                //await coll.InsertOneAsync(project);
             }
             catch (Exception ex)
             {
-                Logger.LogError(new EventId((int)LoggerEventId.MONGO_HELPER_ERROR), ex, "RetrieveRecordsFromChatNode Error: {0}", ex.Message);
+                Logger.LogError(new EventId((int)LoggerEventId.MONGO_HELPER_ERROR), ex, "SaveProject: {0}", ex.Message);
             }
             return null;
         }
 
-        static Random rand = new Random();
-        private static Section GetSection(BsonDocument sectionBsonDocument)
+        public static async Task<bool> SaveChatFlowAsync(ChatFlowPack chatFlow)
         {
-            Section sectObj;
-
-            string sectionType = sectionBsonDocument.GetValue("SectionType")?.ToString();
-            Debug.WriteLine("Section Type:" + sectionType);
-            switch (sectionType?.ToLower())
+            try
             {
-                case "image":
-                    ImageSection imgSectObj = BsonSerializer.Deserialize<ImageSection>(sectionBsonDocument);
-                    Content imgContent = Contents.GetFor(imgSectObj);
-                    if (imgContent != null)
-                    {
-                        imgSectObj.Title = imgContent.Title;
-                        imgSectObj.Caption = imgContent.Caption;
-                    }
-                    sectObj = imgSectObj;
-                    break;
-
-                case "text":
-                    TextSection textSectObj = BsonSerializer.Deserialize<TextSection>(sectionBsonDocument);
-                    Content textContent = Contents.GetFor(textSectObj);
-                    if (textContent != null)
-                    {
-                        textSectObj.Text = textContent.SectionText;
-                        if (textSectObj.DelayInMs == 0)
-                            textSectObj.DelayInMs = Math.Min(Utils.Settings.MaxCapTimeTakenToType, textSectObj.Text.Length * (Utils.Settings.BaseTimeTakenToTypePerChar + rand.Next(0, Utils.Settings.VariableTimeTakenToTypePerChar)));
-                    }
-                    sectObj = textSectObj;
-                    break;
-
-                case "graph":
-                    {
-                        GraphSection gphObj = BsonSerializer.Deserialize<GraphSection>(sectionBsonDocument);
-
-                        Content docContent = Contents.GetFor(gphObj);
-                        if (docContent != null)
-                        {
-                            gphObj.Caption = docContent.Caption;
-
-                            gphObj.X.Label = docContent.XLabel;
-                            gphObj.Y.Label = docContent.YLabel;
-                        }
-                        gphObj.CoordinatesSet = new List<Coordinates>();
-                        BsonArray coordinateSetBsonArray = sectionBsonDocument.GetValue("CoordinatesSet").AsBsonArray;
-
-
-                        if (coordinateSetBsonArray != null)
-                            foreach (BsonDocument coordinateSetBsonDoc in coordinateSetBsonArray)
-                            {
-                                var coordinateListId = coordinateSetBsonDoc.GetValue("CoordinateListId")?.ToString();
-                                if (!string.IsNullOrWhiteSpace(coordinateListId))
-                                    continue;
-
-                                var coordinatesObj = new Coordinates()
-                                {
-                                    CoordinateListId = coordinateListId
-                                };
-
-                                var coordinateContent = Contents.GetFor(coordinatesObj);
-                                coordinatesObj.LegendName = coordinateContent?.CoordinateListLegend;
-
-                                if (coordinateSetBsonDoc.TryGetValue("CoordinateList", out BsonValue tempCoordinateList))
-                                {
-                                    BsonArray coordinateListBsonArray = tempCoordinateList?.AsBsonArray;
-                                    if (coordinateListBsonArray != null)
-                                        foreach (BsonDocument coordinateBsonDoc in coordinateListBsonArray)
-                                        {
-                                            string x = coordinateBsonDoc.GetValue("X")?.AsString;
-                                            string y = coordinateBsonDoc.GetValue("Y")?.AsString;
-
-                                            string coordinateText = coordinateContent?.CoordinateText;
-
-                                            if (string.IsNullOrWhiteSpace(coordinateText))
-                                                coordinatesObj.AddXYCoordinates(x, y);
-                                            else
-                                                coordinatesObj.AddXYCoordinates(x, y, coordinateText);
-
-                                            Debug.WriteLine(coordinatesObj.ToJson());
-                                        }
-                                }
-                                gphObj.CoordinatesSet.Add(coordinatesObj);
-                            }
-                        sectObj = gphObj;
-                    }
-
-                    break;
-
-                case "gif":
-                    GifSection gifObj = BsonSerializer.Deserialize<GifSection>(sectionBsonDocument);
-                    Content gifContent = Contents.GetFor(gifObj);
-                    if (gifContent != null)
-                    {
-                        gifObj.Title = gifContent.Title;
-                        gifObj.Caption = gifContent.Caption;
-                    }
-                    sectObj = gifObj;
-                    break;
-
-                case "audio":
-                    AudioSection audioObj = BsonSerializer.Deserialize<AudioSection>(sectionBsonDocument);
-                    Content audioContent = Contents.GetFor(audioObj);
-                    if (audioContent != null)
-                    {
-                        audioObj.Title = audioContent.Title;
-                        audioObj.Caption = audioContent.Caption;
-                    }
-
-                    sectObj = audioObj;
-                    break;
+                var chatsColl = ChatDB.GetCollection<ChatFlowPack>(Settings.ChatFlowPacksCollectionName);
+                if (string.IsNullOrWhiteSpace(chatFlow.ProjectId))
+                    chatFlow.ProjectId = ObjectId.GenerateNewId().ToString();
 
-                case "video":
-                    VideoSection videoObj = BsonSerializer.Deserialize<VideoSection>(sectionBsonDocument);
-                    Content videoContent = Contents.GetFor(videoObj);
-                    if (videoContent != null)
-                    {
-                        videoObj.Title = videoContent.Title;
-                        videoObj.Caption = videoContent.Caption;
-                    }
-                    sectObj = videoObj;
-                    break;
-
-                case "link":
-                    UrlSection urlObj = BsonSerializer.Deserialize<UrlSection>(sectionBsonDocument);
-                    sectObj = urlObj;
-                    break;
-
-                case "embeddedhtml":
-                    EmbeddedHtmlSection embeddedHtmlObj = BsonSerializer.Deserialize<EmbeddedHtmlSection>(sectionBsonDocument);
-                    Content embeddedHtmlContent = Contents.GetFor(embeddedHtmlObj);
-                    if (embeddedHtmlContent != null)
-                    {
-                        embeddedHtmlObj.Title = embeddedHtmlContent.Title;
-                        embeddedHtmlObj.Caption = embeddedHtmlContent.Caption;
-                    }
-                    sectObj = embeddedHtmlObj;
-                    break;
+                if (await chatsColl.CountAsync(x => x.ProjectId == chatFlow.ProjectId, new CountOptions { Limit = 1 }) > 0)
+                {
+                    chatFlow.UpdatedOn = DateTime.UtcNow;
+                    await chatsColl.ReplaceOneAsync(x => x.ProjectId == chatFlow.ProjectId, chatFlow);
+                    return true;
+                }
+                chatFlow.CreatedOn = chatFlow.UpdatedOn = DateTime.UtcNow;
+                await chatsColl.InsertOneAsync(chatFlow);
+            }
+            catch (Exception ex)
+            {
+                Logger.LogError(new EventId((int)LoggerEventId.MONGO_HELPER_ERROR), ex, "SaveChatFlowAsync: {0}", ex.Message);
+            }
+            return false;
+        }
 
-                case "carousel":
-                    var carouselObj = BsonSerializer.Deserialize<CarouselSection>(sectionBsonDocument);
-                    var carContent = Contents.GetFor(carouselObj);
-                    if (carContent != null)
-                    {
-                        carouselObj.Title = carContent.Title;
-                        carouselObj.Caption = carContent.Caption;
-                    }
-                    if (carouselObj.Items != null)
-                        foreach (var carItem in carouselObj.Items)
-                        {
-                            var content = Contents.GetFor(carItem);
-                            if (content != null)
-                            {
-                                carItem.Title = content.Title;
-                                carItem.Caption = content.Caption;
-                            }
-                            if (carItem.Buttons != null)
-                                foreach (var carBtn in carItem.Buttons)
-                                {
-                                    var carBtnContent = Contents.GetFor(carBtn);
-                                    carBtn.Text = carBtnContent?.ButtonText;
-                                }
-                        }
-                    sectObj = carouselObj;
-                    break;
-                case "printotp":
-                    PrintOTPSection printOTPSection = BsonSerializer.Deserialize<PrintOTPSection>(sectionBsonDocument);
-                    //No content to load for Section Type: PrintOTP
-                    sectObj = printOTPSection;
-                    break;
-                default:
-                    sectObj = null;
-                    break;
+        public static async Task<ChatFlowPack> GetChatFlowPackAsync(string projectId)
+        {
+            try
+            {
+                return await ChatDB.GetCollection<ChatFlowPack>(Settings.ChatFlowPacksCollectionName).Find(x => x.ProjectId == projectId).SingleOrDefaultAsync();
+            }
+            catch (Exception ex)
+            {
+                Logger.LogError(new EventId((int)LoggerEventId.MONGO_HELPER_ERROR), ex, "GetChatFlowPackAsync: {0}", ex.Message);
+                return null;
             }
-            return sectObj;
         }
 
-        public static void InsertActivityEvent(ChatActivityEvent activityEvent)
+        public static async Task<ChatFlowPack> GetChatFlowPackByProjectNameAsync(string projectName)
         {
             try
             {
-                if (activityEvent != null && string.IsNullOrWhiteSpace(activityEvent._id))
-                    activityEvent._id = ObjectId.GenerateNewId().ToString();
+                var project = await GetProjectByNameAsync(projectName);
+                if (project == null || string.IsNullOrWhiteSpace(project.Name)) return null;
 
-                var coll = ChatDB.GetCollection<ChatActivityEvent>(Settings.ActivityEventLogCollectionName);
-                coll.InsertOne(activityEvent);
+                return await ChatDB.GetCollection<ChatFlowPack>(Settings.ChatFlowPacksCollectionName).Find(x => x.ProjectId == project._id).SingleOrDefaultAsync();
             }
             catch (Exception ex)
             {
-                Logger.LogError(new EventId((int)LoggerEventId.MONGO_HELPER_ERROR), ex, "InsertActivityEvent: {0}", ex.Message);
+                Logger.LogError(new EventId((int)LoggerEventId.MONGO_HELPER_ERROR), ex, "GetChatFlowPackByProjectNameAsync: {0}", ex.Message);
+                return null;
             }
         }
     }
diff --git a/ANAConversationPlatform/Helpers/Utils.cs b/ANAConversationPlatform/Helpers/Utils.cs
index c8e0ebc..76baafb 100644
--- a/ANAConversationPlatform/Helpers/Utils.cs
+++ b/ANAConversationPlatform/Helpers/Utils.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Text;
 using System.Threading.Tasks;
 
 namespace ANAConversationPlatform.Helpers
@@ -8,8 +9,20 @@ namespace ANAConversationPlatform.Helpers
     public static class Utils
     {
         public static Settings Settings { get; set; }
+        public static BasicAuth BasicAuth { get; set; }
     }
+    public class BasicAuth
+    {
+        public string APIKey { get; set; }
+        public string APISecret { get; set; }
 
+        public string GetBase64()
+        {
+            if (string.IsNullOrWhiteSpace(APIKey) || string.IsNullOrWhiteSpace(APISecret))
+                return null;
+            return Convert.ToBase64String(Encoding.UTF8.GetBytes($"{APIKey}:{APISecret}"));
+        }
+    }
     public class Settings
     {
         public string StudioDistFolder { get; set; }
@@ -17,4 +30,13 @@ public class Settings
         public int BaseTimeTakenToTypePerChar { get; set; }
         public int VariableTimeTakenToTypePerChar { get; set; }
     }
+    public class APIResponse
+    {
+        public bool Status { get; set; }
+        public string Message { get; set; }
+    }
+    public class DataResponse<T> : APIResponse
+    {
+        public T Data { get; set; }
+    }
 }
diff --git a/ANAConversationPlatform/Models/ANAProject.cs b/ANAConversationPlatform/Models/ANAProject.cs
new file mode 100644
index 0000000..21104ec
--- /dev/null
+++ b/ANAConversationPlatform/Models/ANAProject.cs
@@ -0,0 +1,7 @@
+namespace ANAConversationPlatform.Models
+{
+    public class ANAProject : BaseIdTimestampEntity
+    {
+        public string Name { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/ANAConversationPlatform/Models/Activity/ChatActivityItem.cs b/ANAConversationPlatform/Models/Activity/ChatActivityItem.cs
index 76a76b1..1b4a832 100644
--- a/ANAConversationPlatform/Models/Activity/ChatActivityItem.cs
+++ b/ANAConversationPlatform/Models/Activity/ChatActivityItem.cs
@@ -13,6 +13,7 @@ public class ChatActivityEvent
         public Dictionary<string, string> UserData { get; set; }
         public string UserId { get; set; }
         public string NodeId { get; set; }
+        public string ProjectId { get; set; }
         public DateTime EventDateTime { get; set; }
     }
 }
\ No newline at end of file
diff --git a/ANAConversationPlatform/Models/BaseContent.cs b/ANAConversationPlatform/Models/BaseContent.cs
new file mode 100644
index 0000000..208a65e
--- /dev/null
+++ b/ANAConversationPlatform/Models/BaseContent.cs
@@ -0,0 +1,44 @@
+namespace ANAConversationPlatform.Models
+{
+    public class BaseContent : BaseIdTimestampEntity
+    {
+        public string NodeName { get; set; }
+        public string NodeId { get; set; }
+        public string Emotion { get; set; }
+    }
+
+    public class SectionContent : BaseContent
+    {
+        public string SectionId { get; set; }
+    }
+
+    public class TextSectionContent : SectionContent
+    {
+        public string SectionText { get; set; }
+    }
+
+    public class TitleCaptionSectionContent : SectionContent
+    {
+        public string Title { get; set; }
+        public string Caption { get; set; }
+    }
+    
+    public class ButtonContent : BaseContent
+    {
+        public string ButtonId { get; set; }
+        public string ButtonText { get; set; }
+    }
+
+    public class CarouselButtonContent : BaseContent
+    {
+        public string CarouselButtonId { get; set; }
+        public string ButtonText { get; set; }
+    }
+
+    public class CarouselItemContent : BaseContent
+    {
+        public string CarouselItemId { get; set; }
+        public string Title { get; set; }
+        public string Caption { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/ANAConversationPlatform/Models/BaseEntity.cs b/ANAConversationPlatform/Models/BaseEntity.cs
index daa19bc..ecd9fa1 100644
--- a/ANAConversationPlatform/Models/BaseEntity.cs
+++ b/ANAConversationPlatform/Models/BaseEntity.cs
@@ -1,7 +1,20 @@
-namespace ANAConversationPlatform.Models
+using System;
+
+namespace ANAConversationPlatform.Models
 {
-    public class BaseEntity
-	{
-		public string _id { get; set; }
-	}
+    public class BaseIdEntity
+    {
+        public string _id { get; set; }
+    }
+
+    public class BaseIdTimestampEntity : BaseIdEntity
+    {
+        public DateTime CreatedOn { get; set; }
+        public DateTime UpdatedOn { get; set; }
+    }
+
+    public class BaseEntity : BaseIdEntity
+    {
+        public string Alias { get; set; }
+    }
 }
\ No newline at end of file
diff --git a/ANAConversationPlatform/Models/Button.cs b/ANAConversationPlatform/Models/Button.cs
index 3929c4d..2c75938 100644
--- a/ANAConversationPlatform/Models/Button.cs
+++ b/ANAConversationPlatform/Models/Button.cs
@@ -35,6 +35,12 @@ public Button(string id = "", string buttonName = "", string buttonText = "", Em
         public string APIResponseMatchValue { get; set; }
 
         public bool PostToChat { get; set; } = true;
+
+        public bool DoesRepeat { get; set; }
+        public string RepeatOn { get; set; }
+        public string RepeatAs { get; set; }
+        public int StartPosition { get; set; }
+        public int MaxRepeats { get; set; }
     }
     public enum ButtonTypeEnum
     {
diff --git a/ANAConversationPlatform/Models/ChatFlowPack.cs b/ANAConversationPlatform/Models/ChatFlowPack.cs
new file mode 100644
index 0000000..c12cab9
--- /dev/null
+++ b/ANAConversationPlatform/Models/ChatFlowPack.cs
@@ -0,0 +1,13 @@
+using System.Collections.Generic;
+
+namespace ANAConversationPlatform.Models
+{
+    public class ChatFlowPack : BaseIdTimestampEntity
+    {
+        public string ProjectId { get; set; }
+
+        public List<ChatNode> ChatNodes { get; set; }
+        public List<BaseContent> ChatContent { get; set; }
+        public Dictionary<string, LayoutPoint> NodeLocations { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/ANAConversationPlatform/Models/ChatNode.cs b/ANAConversationPlatform/Models/ChatNode.cs
index 7675a54..e4bc2e8 100644
--- a/ANAConversationPlatform/Models/ChatNode.cs
+++ b/ANAConversationPlatform/Models/ChatNode.cs
@@ -26,6 +26,7 @@ public ChatNode(string id)
         public string VariableName { get; set; }
         public string ApiMethod { get; set; }
         public string ApiUrl { get; set; }
+        public string ApiResponseDataRoot { get; set; }
         public string NextNodeId { get; set; }
         public string[] RequiredVariables { get; set; }
         public string GroupName { get; set; }
diff --git a/ANAConversationPlatform/Models/Content.cs b/ANAConversationPlatform/Models/Content.cs
deleted file mode 100644
index 17b52d0..0000000
--- a/ANAConversationPlatform/Models/Content.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-
-namespace ANAConversationPlatform.Models
-{
-    public class Content
-    {
-        public string _id { get; set; }
-        public string NodeName { get; set; }
-        public string NodeId { get; set; }
-        public string Emotion { get; set; }
-        public string NodeHeaderText { get; set; }
-        public string SectionId { get; set; }
-        public string SectionNumber { get; set; }
-        public string SectionText { get; set; }
-        public string ButtonId { get; set; }
-        public int Button { get; set; }
-        public string ButtonName { get; set; }
-        public string ButtonText { get; set; }
-        public string Title { get; set; }
-        public string Caption { get; set; }
-        public string AltText { get; set; }
-
-        public string XLabel { get; set; }
-        public string YLabel { get; set; }
-        public string CoordinateListLegend { get; set; }
-        public string CoordinateListId { get; set; }
-        public string CoordinateText { get; set; }
-
-        #region Carousal Item and Button Identifiers
-        public string CarouselItemId { get; set; }
-        public string CarouselButtonId { get; set; }
-        #endregion
-    }
-}
diff --git a/ANAConversationPlatform/Models/LayoutPoint.cs b/ANAConversationPlatform/Models/LayoutPoint.cs
new file mode 100644
index 0000000..1f2d4a3
--- /dev/null
+++ b/ANAConversationPlatform/Models/LayoutPoint.cs
@@ -0,0 +1,8 @@
+namespace ANAConversationPlatform.Models
+{
+    public class LayoutPoint
+    {
+        public double X { get; set; }
+        public double Y { get; set; }
+    }
+}
diff --git a/ANAConversationPlatform/Models/Sections/CarouselSection.cs b/ANAConversationPlatform/Models/Sections/CarouselSection.cs
index 609622c..89c7ef2 100644
--- a/ANAConversationPlatform/Models/Sections/CarouselSection.cs
+++ b/ANAConversationPlatform/Models/Sections/CarouselSection.cs
@@ -19,6 +19,14 @@ public class CarouselItem : BaseEntity
         public string Caption { get; set; }
         public string ImageUrl { get; set; }
         public List<CarouselButton> Buttons { get; set; } = new List<CarouselButton>();
+
+        #region Repeat
+        public bool DoesRepeat { get; set; }
+        public string RepeatOn { get; set; }
+        public string RepeatAs { get; set; }
+        public int StartPosition { get; set; }
+        public int MaxRepeats { get; set; }
+        #endregion
     }
 
     public class CarouselButton : BaseEntity
@@ -28,6 +36,14 @@ public class CarouselButton : BaseEntity
         public CardButtonType Type { get; set; }
         public string VariableValue { get; set; }
         public string NextNodeId { get; set; }
+
+        #region Repeat
+        public bool DoesRepeat { get; set; }
+        public string RepeatOn { get; set; }
+        public string RepeatAs { get; set; }
+        public int StartPosition { get; set; }
+        public int MaxRepeats { get; set; }
+        #endregion
     }
 
     public enum CardButtonType
diff --git a/ANAConversationPlatform/Models/Sections/GraphSection.cs b/ANAConversationPlatform/Models/Sections/GraphSection.cs
deleted file mode 100644
index f2af616..0000000
--- a/ANAConversationPlatform/Models/Sections/GraphSection.cs
+++ /dev/null
@@ -1,132 +0,0 @@
-using System.Collections.Generic;
-using System.ComponentModel;
-
-namespace ANAConversationPlatform.Models.Sections
-{
-    public class GraphSection : Section
-	{
-		public List<Coordinates> CoordinatesSet { get; set; } = new List<Coordinates>();
-		public Axis X { get; set; } = new Axis();
-		public Axis Y { get; set; } = new Axis(); 
-
-		public string Caption { get; set; }
-		public GraphTypeEnum GraphType { get; set; }
-
-		public GraphSection(string id, int delayInMs, List<Coordinates> coordinatesSet, Axis x, Axis y, string caption, GraphTypeEnum graphType) : base(id, SectionTypeEnum.Graph, delayInMs)
-		{
-			this.CoordinatesSet = coordinatesSet;
-			this.X = x;
-			this.Y = y;
-			this.Caption = caption;
-			this.GraphType = graphType;
-		}
-
-		public GraphSection(string id, int delayInMs = 0) : base(id, SectionTypeEnum.Graph, delayInMs)
-		{ 
-		}
-
-        public GraphSection() { }
-	}
-
-	public enum GraphTypeEnum
-	{
-		Bar, Line, ScatterPlot, Histogram
-	}
-
-	public class Axis : BaseEntity
-	{
-		public string Label { get; set; }
-
-		public AxisTypeEnum AxisType
-		{
-			get; set;
-		}
-	}
-
-	public enum AxisTypeEnum
-	{
-		[Description("Integer")]
-		Integer,
-
-		[Description("Double")]
-		Double,
-
-		[Description("String")]
-		String,
-
-		//[EnumMember(Value = "yyyy-MM-dd")]
-		[Description("yyyy-MM-dd")]
-		YearMonthDay,
-
-		[Description("yyyy-MM")]
-		YearMonth,
-
-		[Description("yyyy-MonthName")]
-		YearMonthName,
-
-		[Description("yyyy-MM-dd hh:mm:ss")]
-		YearMonthDayHourMinuteSecond,
-
-		[Description("hh:mm:ss")]
-		HourMinuteSecond,
-
-		[Description("WeekDay")]
-		WeekDay,
-
-		[Description("yy")]
-		Year,
-
-		[Description("MM")]
-		Month,
-
-		[Description("MonthName")]
-		MonthName,
-
-		[Description("dd")]
-		Day,
-
-		[Description("DayName")]
-		DayName,
-	}
-
-	public class Coordinates
-	{
-		public string CoordinateListId { get; set; }
-		public List<Coordinate> CoordinateList { get; set; } = new List<Coordinate>();
-		public string LegendName { get; set; }
-
-		public void AddXYCoordinates(string x, string y)
-		{
-			if (CoordinateList == null)
-				CoordinateList = new List<Coordinate>();
-
-			CoordinateList.Add(new Coordinate(x, y));
-		}
-
-		public void AddXYCoordinates(string x, string y, string coordinateName)
-		{
-			if (CoordinateList == null)
-				CoordinateList = new List<Coordinate>();
-
-			CoordinateList.Add(new Coordinate(x, y, coordinateName));
-		}
-	}
-
-	public class Coordinate
-	{
-		public Coordinate(string x, string y)
-		{
-			this.X = x;
-			this.Y = y;
-		}
-
-		public Coordinate(string x, string y, string coordinateText) : this(x, y)
-		{
-			this.CoordinateText = coordinateText;
-		}
-        public Coordinate() { }
-		public string X { get; private set; }
-		public string Y { get; private set; }
-		public string CoordinateText { get; private set; }
-	}
-}
\ No newline at end of file
diff --git a/ANAConversationPlatform/Models/Settings/DatabaseConnectionSettings.cs b/ANAConversationPlatform/Models/Settings/DatabaseConnectionSettings.cs
index 283cdf8..5b60129 100644
--- a/ANAConversationPlatform/Models/Settings/DatabaseConnectionSettings.cs
+++ b/ANAConversationPlatform/Models/Settings/DatabaseConnectionSettings.cs
@@ -1,14 +1,12 @@
-using Newtonsoft.Json;
-
-namespace ANAConversationPlatform.Models.Settings
+namespace ANAConversationPlatform.Models.Settings
 {
     public class DatabaseConnectionSettings
     {
         public string ConnectionString { get; set; }
-        public string TemplateCollectionName { get; set; }
-        public string ContentCollectionName { get; set; }
         public string DatabaseName { get; set; }
-        public bool CacheContent { get; set; }
+
+        public string ProjectsCollectionName { get; set; }
+        public string ChatFlowPacksCollectionName { get; set; }
         public string ActivityEventLogCollectionName { get; set; }
     }
 }
\ No newline at end of file
diff --git a/ANAConversationPlatform/Program.cs b/ANAConversationPlatform/Program.cs
index 3e914ad..d4b8c39 100644
--- a/ANAConversationPlatform/Program.cs
+++ b/ANAConversationPlatform/Program.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
+using System.IO;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 
diff --git a/ANAConversationPlatform/Startup.cs b/ANAConversationPlatform/Startup.cs
index 747503a..9fc2c0c 100644
--- a/ANAConversationPlatform/Startup.cs
+++ b/ANAConversationPlatform/Startup.cs
@@ -8,6 +8,7 @@
 using ANAConversationPlatform.Helpers;
 using System.Threading.Tasks;
 using static ANAConversationPlatform.Helpers.Constants;
+using Newtonsoft.Json.Serialization;
 
 namespace ANAConversationPlatform
 {
@@ -29,12 +30,15 @@ public Startup(IHostingEnvironment env)
             RocketChatSDK.Settings = Configuration.GetSection(nameof(AgentChatSettings)).Get<AgentChatSettings>();
             LiveClientSocketsHelper.Settings = Configuration.GetSection(nameof(LiveClientSocketsServerSettings)).Get<LiveClientSocketsServerSettings>();
             Utils.Settings = Configuration.GetSection(nameof(Helpers.Settings)).Get<Helpers.Settings>();
+            Utils.BasicAuth = Configuration.GetSection(nameof(Helpers.BasicAuth)).Get<Helpers.BasicAuth>();
         }
 
         // This method gets called by the runtime. Use this method to add services to the container.
         public void ConfigureServices(IServiceCollection services)
         {
-            services.AddMvc();
+            services
+                .AddMvc()
+                .AddJsonOptions(options => options.SerializerSettings.ContractResolver = new DefaultContractResolver()); ;
         }
 
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
@@ -45,8 +49,8 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerF
                 .AddFile(Configuration.GetSection("FileLogging"));
 
             RocketChatSDK.Logger = loggerFactory.CreateLogger<RocketChatSDK>();
-            MongoHelper.Logger = loggerFactory.CreateLogger("MongoHelper");
-
+            MongoHelper.Logger = loggerFactory.CreateLogger(nameof(MongoHelper));
+            ChatFlowBuilder.Logger = loggerFactory.CreateLogger(nameof(ChatFlowBuilder));
             Task.Run(async () =>
             {
                 try
diff --git a/ANAConversationPlatform/appsettings-Sample.json b/ANAConversationPlatform/appsettings-Sample.json
index c6a7ae9..907f42a 100644
--- a/ANAConversationPlatform/appsettings-Sample.json
+++ b/ANAConversationPlatform/appsettings-Sample.json
@@ -13,18 +13,17 @@
     }
   },
   "Settings": {
-    "StudioDistFolder": "[Path to folder where studio zips are put when an update has to be pushed, in the format, {major}.{minor}.{build}.{rev}.zip]",
+    "StudioDistFolder": "[Path to folder where studio zips are put when an update has to be pushed, in the format: {major}.{minor}.{build}.{rev}.zip]",
     "MaxCapTimeTakenToType": 3000,
     "BaseTimeTakenToTypePerChar": 30,
     "VariableTimeTakenToTypePerChar": 10
   },
   "DatabaseConnectionSettings": {
     "ConnectionString": "[MongoDB Connection String]",
-    "TemplateCollectionName": "[New Empty Collection Name A]",
-    "ContentCollectionName": "[New Empty Collection Name B]",
     "DatabaseName": "[Mongo Database name]",
-    "CacheContent": false,
-    "ActivityEventLogCollectionName": "[New Empty Collection Name C]"
+    "ActivityEventLogCollectionName": "[New Empty Collection Name A]",
+    "ProjectsCollectionName": "[New Empty Collection Name B]",
+    "ChatFlowPacksCollectionName": "[New Empty Collection Name C]"
   },
   "AgentChatSettings": {
     "DefaultAgentUserName": "[Fallback username if no agent is online]",
@@ -35,5 +34,10 @@
   "LiveClientSocketsServerSettings": {
     "Server": "[Sockets Server Endpoint, Should end with '/']",
     "AuthBasic": "[Sockets Server Auth Header without 'Basic ' part]"
+  },
+  "BasicAuth": {
+    //Use the same in the studio. Leaving them empty will enable public write access to your chat server!
+    "APIKey": "", //Set an api key here
+    "APISecret": "" //Set an api secret here.
   }
 }
diff --git a/ANAConversationSimulator/App.xaml.cs b/ANAConversationSimulator/App.xaml.cs
index 2517e64..a8f4a4e 100644
--- a/ANAConversationSimulator/App.xaml.cs
+++ b/ANAConversationSimulator/App.xaml.cs
@@ -6,6 +6,8 @@
 using System;
 using Windows.UI.Xaml.Data;
 using ANAConversationSimulator.Helpers;
+using Windows.Foundation;
+using ANAConversationSimulator.ViewModels;
 
 namespace ANAConversationSimulator
 {
@@ -52,6 +54,23 @@ public override async Task OnInitializeAsync(IActivatedEventArgs args)
 
         public override async Task OnStartAsync(StartKind startKind, IActivatedEventArgs args)
         {
+            if (args is ProtocolActivatedEventArgs pArgs)
+            {
+                if (!string.IsNullOrWhiteSpace(pArgs.Uri.Query))
+                {
+                    try
+                    {
+                        var parsedQuery = new WwwFormUrlDecoder(pArgs.Uri.Query);
+                        if (parsedQuery.Count > 0)
+                        {
+                            var chatUrl = parsedQuery.GetFirstValueByName("chatflow");
+                            Utils.APISettings.Values["API"] = chatUrl;
+                            MainPageViewModel.CurrentInstance?.StartChatting();
+                        }
+                    }
+                    catch { }
+                }
+            }
             // long-running startup tasks go here
             await Utils.LoadConfig();
 
diff --git a/ANAConversationSimulator/Helpers/APIHelper.cs b/ANAConversationSimulator/Helpers/APIHelper.cs
index c9ed070..5732c2d 100644
--- a/ANAConversationSimulator/Helpers/APIHelper.cs
+++ b/ANAConversationSimulator/Helpers/APIHelper.cs
@@ -67,7 +67,7 @@ public static async Task<TResponse> UploadFile<TResponse>(string fileName, Stora
                     Utils.APISettings.Values.TryGetValue("UploadFileAPI", out object UploadFileAPI);
                     if (string.IsNullOrWhiteSpace(UploadFileAPI + ""))
                     {
-                        Utils.ShowDialog("Upload File API is not set. Please go to Menu(...) -> Update APIs and set it.");
+                        //Utils.ShowDialog("Upload File API is not set. Please go to Menu(...) -> Update APIs and set it.");
                         return default(TResponse);
                     }
                     var resp = await client.PostAsync((UploadFileAPI + "").Replace("{fileName}", Uri.EscapeDataString(fileName)), new StreamContent(fStrm));
@@ -84,7 +84,7 @@ public static async Task TrackEvent(ChatActivityEvent activityEvent)
                 Utils.APISettings.Values.TryGetValue("ActivityTrackAPI", out object ActivityTrackAPI);
                 if (string.IsNullOrWhiteSpace(ActivityTrackAPI + ""))
                 {
-                    Utils.ShowDialog("Activity Track API is not set. Please go to Menu(...) -> Update APIs and set it.");
+                    //Utils.ShowDialog("Activity Track API is not set. Please go to Menu(...) -> Update APIs and set it.");
                     return;
                 }
                 await HitPostAsync(ActivityTrackAPI + "", activityEvent);
diff --git a/ANAConversationSimulator/Helpers/ButtonActionHelper.cs b/ANAConversationSimulator/Helpers/ButtonActionHelper.cs
index 98c8d1c..a8828a4 100644
--- a/ANAConversationSimulator/Helpers/ButtonActionHelper.cs
+++ b/ANAConversationSimulator/Helpers/ButtonActionHelper.cs
@@ -13,6 +13,7 @@
 using Windows.Storage.Pickers;
 using Windows.System;
 using Windows.UI.Popups;
+using Newtonsoft.Json.Linq;
 
 namespace ANAConversationSimulator.Helpers
 {
@@ -23,12 +24,39 @@ public static void HandleSaveTextInput(string varName, string varValue)
             if (string.IsNullOrWhiteSpace(varName)) return;
             Utils.LocalStore[varName] = varValue?.Trim();
         }
+        public static void ClearSavedValue(string varName)
+        {
+            if (string.IsNullOrWhiteSpace(varName)) return;
+            if (Utils.LocalStore.ContainsKey(varName))
+                Utils.LocalStore.Remove(varName);
+        }
         public static object GetSavedValue(string varName)
         {
+            if (string.IsNullOrWhiteSpace(varName))
+                return null;
+
+            if (varName.Contains('.'))
+            {
+                var all = varName.Split('.');
+                var baseName = all[0];
+                if (Utils.LocalStore.ContainsKey(baseName))
+                {
+                    var stripped = string.Join(".", varName.Split('.').Skip(1).ToArray());
+                    var obj = JToken.Parse(Utils.LocalStore[baseName] + "");
+                    return obj.SelectToken(stripped) + "";
+                }
+            }
+
             if (Utils.LocalStore.ContainsKey(varName))
                 return Utils.LocalStore[varName];
             return null;
         }
+        public static JArray GetSavedArray(string varName)
+        {
+            if (Utils.LocalStore.ContainsKey(varName) && !string.IsNullOrWhiteSpace(Utils.LocalStore[varName] + ""))
+                return JArray.Parse(Utils.LocalStore[varName] + "");
+            return null;
+        }
         public static void HandleSaveMultiple(Dictionary<string, object> dict)
         {
             foreach (var item in dict)
diff --git a/ANAConversationSimulator/Helpers/Utils.cs b/ANAConversationSimulator/Helpers/Utils.cs
index 5392806..68c4372 100644
--- a/ANAConversationSimulator/Helpers/Utils.cs
+++ b/ANAConversationSimulator/Helpers/Utils.cs
@@ -4,22 +4,16 @@
 using Newtonsoft.Json.Linq;
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Linq;
-using System.Runtime.InteropServices.WindowsRuntime;
 using System.Security.Cryptography;
 using System.Text;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using Windows.ApplicationModel;
 using Windows.Foundation.Collections;
-using Windows.Graphics.Imaging;
 using Windows.Storage;
-using Windows.Storage.Streams;
 using Windows.System.Profile;
 using Windows.UI.Popups;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Media.Imaging;
 
 namespace ANAConversationSimulator.Helpers
 {
@@ -218,28 +212,12 @@ public static bool IsSectionTypePresentInNode(JToken node, SectionTypeEnum secTy
             return node?["Sections"]?.Any(x => x.ToObject<Section>()?.SectionType == secType) == true;
         }
 
-        public static string NormalizeFileName(string text)
+        public static T DeepCopy<T>(this T source)
         {
-            if (text == null)
-                text = "New File";
-            foreach (var c in Path.GetInvalidFileNameChars())
-                text.Replace(c, '_');
-            return text;
+            var json = JsonConvert.SerializeObject(source);
+            return JsonConvert.DeserializeObject<T>(json);
         }
 
-        public static async Task SaveVisualElementToFile(FrameworkElement element, StorageFile file)
-        {
-            var renderTargetBitmap = new RenderTargetBitmap();
-            await renderTargetBitmap.RenderAsync(element, (int)element.Width, (int)element.Height);
-            var pixels = await renderTargetBitmap.GetPixelsAsync();
-            using (IRandomAccessStream stream = await file.OpenAsync(FileAccessMode.ReadWrite))
-            {
-                var encoder = await BitmapEncoder.CreateAsync(BitmapEncoder.PngEncoderId, stream);
-                byte[] bytes = pixels.ToArray();
-                encoder.SetPixelData(BitmapPixelFormat.Bgra8, BitmapAlphaMode.Straight, (uint)renderTargetBitmap.PixelWidth, (uint)renderTargetBitmap.PixelHeight, 96, 96, bytes);
-                await encoder.FlushAsync();
-            }
-        }
     }
 
     public enum DeviceFormFactorType
diff --git a/ANAConversationSimulator/Helpers/VerbProcessor.cs b/ANAConversationSimulator/Helpers/VerbProcessor.cs
index a83063d..fed7e10 100644
--- a/ANAConversationSimulator/Helpers/VerbProcessor.cs
+++ b/ANAConversationSimulator/Helpers/VerbProcessor.cs
@@ -1,5 +1,8 @@
-using Newtonsoft.Json;
+using ANAConversationSimulator.Models.Chat;
+using ANAConversationSimulator.Models.Chat.Sections;
+using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
+using System.Collections.Generic;
 using System.Text.RegularExpressions;
 
 namespace ANAConversationSimulator.Helpers
@@ -7,7 +10,7 @@ namespace ANAConversationSimulator.Helpers
     public static class VerbProcessor
     {
         const string VERB_REGEX = @"\[~(.*?)\]";
-        public static string Process(string input)
+        public static string Process(string input, bool escape = true)
         {
             if (string.IsNullOrWhiteSpace(input)) return "";
             var matches = Regex.Matches(input, VERB_REGEX);
@@ -18,10 +21,99 @@ public static string Process(string input)
                     var varName = match.Groups[1].Value;
                     var value = ButtonActionHelper.GetSavedValue(varName);
                     if (!string.IsNullOrWhiteSpace(value + ""))
-                        input = input.Replace(match.Value, JsonConvert.SerializeObject(value + "").Trim('"'));
+                    {
+                        if (escape)
+                            input = input.Replace(match.Value, JsonConvert.SerializeObject(value + "").Trim('"'));
+                        else
+                            input = input.Replace(match.Value, value + "");
+                    }
                 }
             }
             return input;
         }
+
+        //public static string ProcessUnescaped(string input)
+        //{
+        //    if (string.IsNullOrWhiteSpace(input)) return "";
+        //    var matches = Regex.Matches(input, VERB_REGEX);
+        //    foreach (Match match in matches)
+        //    {
+        //        if (match.Groups.Count >= 2)
+        //        {
+        //            var varName = match.Groups[1].Value;
+        //            var value = ButtonActionHelper.GetSavedValue(varName);
+        //            if (!string.IsNullOrWhiteSpace(value + ""))
+        //                input = input.Replace(match.Value, value + "");
+        //        }
+        //    }
+        //    return input;
+        //}
+
+        public static List<CarouselButton> ProcessCarousalButtons(List<CarouselButton> sourceButtons, ChatNode parsedNode)
+        {
+            var resultBtns = new List<CarouselButton>();
+            foreach (var btn in sourceButtons)
+            {
+                if (btn != null)
+                {
+                    if (btn.DoesRepeat)
+                    {
+                        var repeatOn = ButtonActionHelper.GetSavedArray(btn.RepeatOn);
+                        var max = btn.MaxRepeats == 0 ? repeatOn.Count - 1 : btn.MaxRepeats;
+                        for (int i = btn.StartPosition; i <= max; i++)
+                        {
+                            var b = btn.DeepCopy();
+                            ButtonActionHelper.ClearSavedValue(b.RepeatAs);
+                            ButtonActionHelper.HandleSaveTextInput(b.RepeatAs, repeatOn[i] + "");
+                            b.Text = Process(b.Text);
+                            b.Url = Process(b.Url);
+                            b.VariableName = parsedNode.VariableName;
+                            b.NodeId = parsedNode.Id;
+                            ButtonActionHelper.ClearSavedValue(b.RepeatAs);
+                            resultBtns.Add(b);
+                        }
+                    }
+                    else
+                    {
+                        btn.VariableName = parsedNode.VariableName;
+                        btn.NodeId = parsedNode.Id;
+                        resultBtns.Add(btn);
+                    }
+                }
+            }
+            return resultBtns;
+        }
+
+        public static List<CarouselItem> ProcessCarousalItems(List<CarouselItem> items, ChatNode parsedNode)
+        {
+            var resultItems = new List<CarouselItem>();
+            foreach (var item in items)
+            {
+                if (item.DoesRepeat)
+                {
+                    var repeatOn = ButtonActionHelper.GetSavedArray(item.RepeatOn);
+                    var max = item.MaxRepeats == 0 ? repeatOn.Count - 1 : item.MaxRepeats;
+                    for (int i = item.StartPosition; i <= max; i++)
+                    {
+                        var it = item.DeepCopy();
+
+                        ButtonActionHelper.ClearSavedValue(it.RepeatAs);
+                        ButtonActionHelper.HandleSaveTextInput(it.RepeatAs, repeatOn[i] + "");
+                        it.Title = VerbProcessor.Process(it.Title);
+                        it.Caption = VerbProcessor.Process(it.Caption);
+                        it.ImageUrl = VerbProcessor.Process(it.ImageUrl);
+                        it.Buttons = VerbProcessor.ProcessCarousalButtons(it.Buttons, parsedNode);
+                        ButtonActionHelper.ClearSavedValue(it.RepeatAs);
+                    }
+                    resultItems.Add(item);
+                }
+                else
+                {
+                    item.Buttons = VerbProcessor.ProcessCarousalButtons(item.Buttons, parsedNode);
+                    resultItems.Add(item);
+                }
+            }
+            return resultItems;
+        }
     }
 }
diff --git a/ANAConversationSimulator/Models/Chat/Button.cs b/ANAConversationSimulator/Models/Chat/Button.cs
index c208b43..34cf725 100644
--- a/ANAConversationSimulator/Models/Chat/Button.cs
+++ b/ANAConversationSimulator/Models/Chat/Button.cs
@@ -29,6 +29,13 @@ public Button() { }
 
         public bool PostToChat { get; set; } = true;
 
+        public bool DoesRepeat { get; set; }
+        public string RepeatOn { get; set; }
+        public string RepeatAs { get; set; }
+        public int StartPosition { get; set; }
+        public int MaxRepeats { get; set; }
+
+
         private Dictionary<string, string> _items;
         /// <summary>
         /// Contains visible/filtered items in case of <see cref="ButtonTypeEnum.GetItemFromSource"/>
diff --git a/ANAConversationSimulator/Models/Chat/ChatNode.cs b/ANAConversationSimulator/Models/Chat/ChatNode.cs
index 797d7db..bafaf10 100644
--- a/ANAConversationSimulator/Models/Chat/ChatNode.cs
+++ b/ANAConversationSimulator/Models/Chat/ChatNode.cs
@@ -20,6 +20,7 @@ public ChatNode(string id)
         public string VariableName { get; set; }
         public string ApiMethod { get; set; }
         public string ApiUrl { get; set; }
+        public string ApiResponseDataRoot { get; set; }
         public string[] RequiredVariables { get; set; }
         public string NextNodeId { get; set; }
         public bool IsStartNode { get; set; }
diff --git a/ANAConversationSimulator/Models/Chat/Sections/CarouselSection.cs b/ANAConversationSimulator/Models/Chat/Sections/CarouselSection.cs
index f360e75..b3df369 100644
--- a/ANAConversationSimulator/Models/Chat/Sections/CarouselSection.cs
+++ b/ANAConversationSimulator/Models/Chat/Sections/CarouselSection.cs
@@ -21,6 +21,14 @@ public class CarouselItem : BaseEntity
         public string Caption { get; set; }
         public string ImageUrl { get; set; }
         public List<CarouselButton> Buttons { get; set; } = new List<CarouselButton>();
+
+        #region Repeat
+        public bool DoesRepeat { get; set; }
+        public string RepeatOn { get; set; }
+        public string RepeatAs { get; set; }
+        public int StartPosition { get; set; }
+        public int MaxRepeats { get; set; }
+        #endregion
     }
 
     public class CarouselButton : BaseEntity
@@ -38,6 +46,14 @@ public class CarouselButton : BaseEntity
         public string VariableName { get; set; }
         [JsonIgnore]
         public string NodeId { get; set; }
+
+        #region Repeat
+        public bool DoesRepeat { get; set; }
+        public string RepeatOn { get; set; }
+        public string RepeatAs { get; set; }
+        public int StartPosition { get; set; }
+        public int MaxRepeats { get; set; }
+        #endregion
     }
 
     public enum CardButtonType
diff --git a/ANAConversationSimulator/Package.appxmanifest b/ANAConversationSimulator/Package.appxmanifest
index 5516113..9114fe1 100644
--- a/ANAConversationSimulator/Package.appxmanifest
+++ b/ANAConversationSimulator/Package.appxmanifest
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" IgnorableNamespaces="uap mp">
-  <Identity Name="44cabbc3-0a2f-4255-b5bb-b099cd5762f9" Publisher="CN=ProjectANA" Version="1.0.76.0" />
+  <Identity Name="44cabbc3-0a2f-4255-b5bb-b099cd5762f9" Publisher="CN=ProjectANA" Version="2.1.0.0" />
   <mp:PhoneIdentity PhoneProductId="44cabbc3-0a2f-4255-b5bb-b099cd5762f9" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
   <Properties>
     <DisplayName>ANA Conversation Simulator</DisplayName>
@@ -36,7 +36,6 @@
   </Applications>
   <Capabilities>
     <Capability Name="internetClient" />
-    <uap:Capability Name="picturesLibrary" />
     <DeviceCapability Name="location" />
   </Capabilities>
 </Package>
\ No newline at end of file
diff --git a/ANAConversationSimulator/Styles/Custom.xaml b/ANAConversationSimulator/Styles/Custom.xaml
index cace85a..10dd51e 100644
--- a/ANAConversationSimulator/Styles/Custom.xaml
+++ b/ANAConversationSimulator/Styles/Custom.xaml
@@ -89,14 +89,14 @@
             <StackPanel Width="200">
                 <TextBlock Text="{Binding Title}" Visibility="{Binding Title, Converter={StaticResource C4FS2V}}" Style="{StaticResource TitleTextStyle}" Foreground="{Binding Direction, Converter={StaticResource DirectionToForegroundColorConverter}}"/>
                 <Image Source="{Binding Url}" MaxHeight="300" Width="200" Stretch="Uniform"/>
-                <TextBlock Text="{Binding Caption}" Visibility="{Binding Caption, Converter={StaticResource C4FS2V}}" Style="{StaticResource CaptionTextStyle}" Foreground="{Binding Direction, Converter={StaticResource DirectionToForegroundColorConverter}}"/>
+                <TextBlock Text="{Binding Caption}" Visibility="{Binding Caption, Converter={StaticResource C4FS2V}}" Style="{StaticResource CaptionTextStyle}" Foreground="{Binding Direction, Converter={StaticResource DirectionToForegroundColorConverter}}" />
             </StackPanel>
         </C4F:ChatBubble>
     </DataTemplate>
     <DataTemplate x:Key="CarouselSectionChatBubbleTemplate">
         <C4F:ChatBubble BorderBrush="{Binding Direction, Converter={StaticResource DirectionToBorderColorConverter}}" Background="{Binding Direction, Converter={StaticResource DirectionToBackgroundColorConverter}}" HorizontalAlignment="{Binding Direction, Converter={StaticResource DirectionToAlignmentConverter}}" ChatBubbleDirection="{Binding Direction, Converter={StaticResource DirectionToBubbleDirectionConverter}}">
             <StackPanel Background="{StaticResource PaleWhiteBrush}">
-                <TextBlock Text="{Binding Title}" Visibility="{Binding Title, Converter={StaticResource C4FS2V}}" Style="{StaticResource TitleTextStyle}" Foreground="Black" />
+                <TextBlock Text="{Binding Title}" Visibility="{Binding Title, Converter={StaticResource C4FS2V}}" Style="{StaticResource TitleTextStyle}" Foreground="{Binding Direction, Converter={StaticResource DirectionToForegroundColorConverter}}" />
                 <ScrollViewer MaxHeight="300" HorizontalScrollBarVisibility="Auto" Padding="-5,0" VerticalScrollBarVisibility="Disabled">
                     <ItemsControl ItemsSource="{Binding Items}">
                         <ItemsControl.ItemsPanel>
@@ -130,52 +130,52 @@
                         </ItemsControl.ItemTemplate>
                     </ItemsControl>
                 </ScrollViewer>
-                <TextBlock Text="{Binding Caption}" Visibility="{Binding Caption, Converter={StaticResource C4FS2V}}" Style="{StaticResource CaptionTextStyle}"  Foreground="Black"/>
+                <TextBlock Text="{Binding Caption}" Visibility="{Binding Caption, Converter={StaticResource C4FS2V}}" Style="{StaticResource CaptionTextStyle}"  Foreground="{Binding Direction, Converter={StaticResource DirectionToForegroundColorConverter}}"/>
             </StackPanel>
         </C4F:ChatBubble>
     </DataTemplate>
     <DataTemplate x:Key="VideoSectionChatBubbleTemplate">
         <C4F:ChatBubble BorderBrush="{Binding Direction, Converter={StaticResource DirectionToBorderColorConverter}}" Background="{Binding Direction, Converter={StaticResource DirectionToBackgroundColorConverter}}" HorizontalAlignment="{Binding Direction, Converter={StaticResource DirectionToAlignmentConverter}}" ChatBubbleDirection="{Binding Direction, Converter={StaticResource DirectionToBubbleDirectionConverter}}">
             <StackPanel Width="300">
-                <TextBlock Text="{Binding Title}" Visibility="{Binding Title, Converter={StaticResource C4FS2V}}" Style="{StaticResource TitleTextStyle}" />
+                <TextBlock Text="{Binding Title}" Visibility="{Binding Title, Converter={StaticResource C4FS2V}}" Style="{StaticResource TitleTextStyle}" Foreground="{Binding Direction, Converter={StaticResource DirectionToForegroundColorConverter}}"/>
                 <MediaElement Source="{Binding Url}" Height="300" Width="300" Stretch="Uniform" AreTransportControlsEnabled="True" AutoPlay="False" IsFullWindow="False" >
                     <MediaElement.TransportControls>
                         <MediaTransportControls IsCompact="False" Opacity="0.8" IsVolumeButtonVisible="True" IsFullWindowButtonVisible="True" IsZoomButtonVisible="False" />
                     </MediaElement.TransportControls>
                 </MediaElement>
-                <TextBlock Text="{Binding Caption}" Visibility="{Binding Caption, Converter={StaticResource C4FS2V}}" Style="{StaticResource CaptionTextStyle}"  />
+                <TextBlock Text="{Binding Caption}" Visibility="{Binding Caption, Converter={StaticResource C4FS2V}}" Style="{StaticResource CaptionTextStyle}"  Foreground="{Binding Direction, Converter={StaticResource DirectionToForegroundColorConverter}}"/>
             </StackPanel>
         </C4F:ChatBubble>
     </DataTemplate>
     <DataTemplate x:Key="EmbeddedHtmlSectionChatBubbleTemplate">
         <C4F:ChatBubble BorderBrush="{Binding Direction, Converter={StaticResource DirectionToBorderColorConverter}}" Background="{Binding Direction, Converter={StaticResource DirectionToBackgroundColorConverter}}" HorizontalAlignment="{Binding Direction, Converter={StaticResource DirectionToAlignmentConverter}}" ChatBubbleDirection="{Binding Direction, Converter={StaticResource DirectionToBubbleDirectionConverter}}">
             <StackPanel Width="300">
-                <TextBlock Text="{Binding Title}" Visibility="{Binding Title, Converter={StaticResource C4FS2V}}" Style="{StaticResource TitleTextStyle}" />
+                <TextBlock Text="{Binding Title}" Visibility="{Binding Title, Converter={StaticResource C4FS2V}}" Style="{StaticResource TitleTextStyle}" Foreground="{Binding Direction, Converter={StaticResource DirectionToForegroundColorConverter}}"/>
                 <WebView Height="300" Source="{Binding Url}" />
                 <HyperlinkButton NavigateUri="{Binding Url}" Visibility="{Binding DisplayOpenInBrowserButton, Converter={StaticResource C4FB2V}}" HorizontalAlignment="Right" FontSize="12" Foreground="White" Content="Open in browser"/>
-                <TextBlock Text="{Binding Caption}" Visibility="{Binding Caption, Converter={StaticResource C4FS2V}}" Style="{StaticResource CaptionTextStyle}"  />
+                <TextBlock Text="{Binding Caption}" Visibility="{Binding Caption, Converter={StaticResource C4FS2V}}" Style="{StaticResource CaptionTextStyle}"  Foreground="{Binding Direction, Converter={StaticResource DirectionToForegroundColorConverter}}"/>
             </StackPanel>
         </C4F:ChatBubble>
     </DataTemplate>
     <DataTemplate x:Key="AudioSectionChatBubbleTemplate">
         <C4F:ChatBubble BorderBrush="{Binding Direction, Converter={StaticResource DirectionToBorderColorConverter}}" Background="{Binding Direction, Converter={StaticResource DirectionToBackgroundColorConverter}}" HorizontalAlignment="{Binding Direction, Converter={StaticResource DirectionToAlignmentConverter}}" ChatBubbleDirection="{Binding Direction, Converter={StaticResource DirectionToBubbleDirectionConverter}}">
             <StackPanel Width="300" >
-                <TextBlock Text="{Binding Title}" Visibility="{Binding Title, Converter={StaticResource C4FS2V}}" Style="{StaticResource TitleTextStyle}" />
+                <TextBlock Text="{Binding Title}" Visibility="{Binding Title, Converter={StaticResource C4FS2V}}" Style="{StaticResource TitleTextStyle}" Foreground="{Binding Direction, Converter={StaticResource DirectionToForegroundColorConverter}}"/>
                 <MediaElement Source="{Binding Url}" Height="50" Width="300" Stretch="Uniform" AreTransportControlsEnabled="True" AutoPlay="False" IsFullWindow="False" >
                     <MediaElement.TransportControls>
                         <MediaTransportControls IsCompact="True" IsVolumeButtonVisible="True" IsFullWindowButtonVisible="False" IsZoomButtonVisible="False"/>
                     </MediaElement.TransportControls>
                 </MediaElement>
-                <TextBlock Text="{Binding Caption}" Visibility="{Binding Caption, Converter={StaticResource C4FS2V}}" Style="{StaticResource CaptionTextStyle}"  />
+                <TextBlock Text="{Binding Caption}" Visibility="{Binding Caption, Converter={StaticResource C4FS2V}}" Style="{StaticResource CaptionTextStyle}"  Foreground="{Binding Direction, Converter={StaticResource DirectionToForegroundColorConverter}}"/>
             </StackPanel>
         </C4F:ChatBubble>
     </DataTemplate>
     <DataTemplate x:Key="GifSectionChatBubbleTemplate">
         <C4F:ChatBubble BorderBrush="{Binding Direction, Converter={StaticResource DirectionToBorderColorConverter}}" Background="{Binding Direction, Converter={StaticResource DirectionToBackgroundColorConverter}}" HorizontalAlignment="{Binding Direction, Converter={StaticResource DirectionToAlignmentConverter}}" ChatBubbleDirection="{Binding Direction, Converter={StaticResource DirectionToBubbleDirectionConverter}}">
             <StackPanel Width="200">
-                <TextBlock Text="{Binding Title}" Visibility="{Binding Title, Converter={StaticResource C4FS2V}}" Style="{StaticResource TitleTextStyle}" />
+                <TextBlock Text="{Binding Title}" Visibility="{Binding Title, Converter={StaticResource C4FS2V}}" Style="{StaticResource TitleTextStyle}" Foreground="{Binding Direction, Converter={StaticResource DirectionToForegroundColorConverter}}"/>
                 <Image gif:AnimationBehavior.SourceUri="{Binding Url}" gif:AnimationBehavior.AutoStart="True" gif:AnimationBehavior.RepeatBehavior="Forever" gif:AnimationBehavior.AnimateInDesignMode="True" MaxHeight="200" Width="200" Stretch="Uniform"/>
-                <TextBlock Text="{Binding Caption}" Visibility="{Binding Caption, Converter={StaticResource C4FS2V}}" Style="{StaticResource CaptionTextStyle}"  />
+                <TextBlock Text="{Binding Caption}" Visibility="{Binding Caption, Converter={StaticResource C4FS2V}}" Style="{StaticResource CaptionTextStyle}"  Foreground="{Binding Direction, Converter={StaticResource DirectionToForegroundColorConverter}}"/>
             </StackPanel>
         </C4F:ChatBubble>
     </DataTemplate>
diff --git a/ANAConversationSimulator/UserControls/InputContentDialog.xaml b/ANAConversationSimulator/UserControls/InputContentDialog.xaml
index 727539c..5c29e5a 100644
--- a/ANAConversationSimulator/UserControls/InputContentDialog.xaml
+++ b/ANAConversationSimulator/UserControls/InputContentDialog.xaml
@@ -6,17 +6,17 @@
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     mc:Ignorable="d"
-    Title="Update APIs"
+    Title="Configure Chat Server"
     PrimaryButtonText="Ok"
     SecondaryButtonText="Cancel"
     PrimaryButtonClick="ContentDialog_PrimaryButtonClick"
     SecondaryButtonClick="ContentDialog_SecondaryButtonClick">
     <ScrollViewer>
         <StackPanel>
-            <TextBox Text="{Binding ChatFlowAPI, Mode=TwoWay}" Header="Chat Flow API" Margin="0,10,0,0"/>
-            <TextBox Text="{Binding UploadFileAPI, Mode=TwoWay}" Header="Upload File API" Margin="0,10,0,0"/>
-            <TextBox Text="{Binding ActivityTrackAPI, Mode=TwoWay}" Header="Activity Track API" Margin="0,10,0,0"/>
-            <TextBox Text="{Binding SocketServer, Mode=TwoWay}" Header="Socket Server" Margin="0,10,0,0"/>
+            <TextBox Text="{Binding ChatFlowAPI, Mode=TwoWay}" PlaceholderText="http://[your-server.com]/api/Conversation/Chat" Header="Chat Flow API" Margin="0,10,0,0"/>
+            <TextBox Text="{Binding UploadFileAPI, Mode=TwoWay}" PlaceholderText="http://[your-server.com]/api/Services/ReceiveFile?fileName={fileName}" Header="Upload File API" Margin="0,10,0,0"/>
+            <TextBox Text="{Binding ActivityTrackAPI, Mode=TwoWay}" PlaceholderText="http://[your-server.com]/api/Activity/Track" Header="Activity Track API" Margin="0,10,0,0"/>
+            <TextBox Text="{Binding SocketServer, Mode=TwoWay}" PlaceholderText="http://[your-socket-server.com]/" Header="Socket Server" Margin="0,10,0,0"/>
         </StackPanel>
     </ScrollViewer>
 </ContentDialog>
diff --git a/ANAConversationSimulator/UserControls/InputContentDialog.xaml.cs b/ANAConversationSimulator/UserControls/InputContentDialog.xaml.cs
index 0b6ddcc..3a5f310 100644
--- a/ANAConversationSimulator/UserControls/InputContentDialog.xaml.cs
+++ b/ANAConversationSimulator/UserControls/InputContentDialog.xaml.cs
@@ -9,20 +9,6 @@ public InputContentDialog()
         {
             InitializeComponent();
             DataContext = this;
-
-            Loaded += InputContentDialog_Loaded;
-        }
-
-        private void InputContentDialog_Loaded(object sender, RoutedEventArgs e)
-        {
-            if (string.IsNullOrWhiteSpace(ChatFlowAPI))
-                ChatFlowAPI = "http://<your-server.com>/api/Conversation/Chat";
-            if (string.IsNullOrWhiteSpace(UploadFileAPI))
-                UploadFileAPI = "http://<your-server.com>/api/Services/ReceiveFile?fileName={fileName}";
-            if (string.IsNullOrWhiteSpace(ActivityTrackAPI))
-                ActivityTrackAPI = "http://<your-server.com>/api/Activity/Track";
-            if (string.IsNullOrWhiteSpace(SocketServer))
-                SocketServer = "http://<your-socket-server.com>/";
         }
 
         public string ChatFlowAPI
diff --git a/ANAConversationSimulator/ViewModels/MainPageViewModel.cs b/ANAConversationSimulator/ViewModels/MainPageViewModel.cs
index 74552d7..3288a64 100644
--- a/ANAConversationSimulator/ViewModels/MainPageViewModel.cs
+++ b/ANAConversationSimulator/ViewModels/MainPageViewModel.cs
@@ -112,7 +112,7 @@ public async void ProcessNode(JToken node, JToken section = null)
             }
             ClearButtonTimer();
 
-            //Replaceing verbs
+            //Replacing verbs
             node = JToken.Parse(VerbProcessor.Process(node.ToString()));
 
             var parsedNode = node.ToObject<ChatNode>();
@@ -163,21 +163,15 @@ public async void ProcessNode(JToken node, JToken section = null)
                             }
                             break;
                         default:
-                            Utils.ShowDialog($"{parsedNode.ApiMethod} ApiType Unknown!");
+                            Utils.ShowDialog($"{parsedNode.ApiMethod} ApiMethod Unsupported!");
                             break;
                     }
                     NavigateToNode(nextNodeId);
                 }
-                catch (HttpRequestException ex)
-                {
-                    ToggleTyping(false);
-                    Utils.ShowDialog(ex.ToString());
-                    NavigateToNode(parsedNode.NextNodeId);
-                }
                 catch (Exception ex)
                 {
                     ToggleTyping(false);
-                    Utils.ShowDialog(ex.ToString());
+                    Utils.ShowDialog($"API[{parsedNode.ApiMethod}]: {parsedNode.ApiUrl }\r\nRequired Vars: {(parsedNode.RequiredVariables == null ? "" : string.Join(",", parsedNode.RequiredVariables))}\r\nError: " + ex.Message + "\r\n\r\n" + ex.ToString());
                     NavigateToNode(parsedNode.NextNodeId);
                 }
             }
@@ -191,7 +185,7 @@ public async void ProcessNode(JToken node, JToken section = null)
                 var sectionsSource = node["Sections"];
                 var currentSectionSource = section ?? sectionsSource.First;
 
-                //Replaceing verbs
+                //Replacing verbs
                 currentSectionSource = JToken.Parse(VerbProcessor.Process(currentSectionSource.ToString()));
 
                 SectionTypeEnum secType = (SectionTypeEnum)Enum.Parse(typeof(SectionTypeEnum), currentSectionSource["SectionType"].ToString());
@@ -223,15 +217,10 @@ public async void ProcessNode(JToken node, JToken section = null)
                         parsedSection = currentSectionSource.ToObject<PrintOTPSection>();
                         break;
                     case SectionTypeEnum.Carousel:
-                        parsedSection = currentSectionSource.ToObject<CarouselSection>();
-                        (parsedSection as CarouselSection).Items
-                            .SelectMany(x => x.Buttons)
-                            .Where(X => X != null).ToList()
-                            .ForEach(x =>
-                            {
-                                x.VariableName = parsedNode.VariableName;
-                                x.NodeId = parsedNode.Id;
-                            });
+                        {
+                            parsedSection = currentSectionSource.ToObject<CarouselSection>();
+                            (parsedSection as CarouselSection).Items = VerbProcessor.ProcessCarousalItems((parsedSection as CarouselSection).Items, parsedNode);
+                        }
                         break;
                     case SectionTypeEnum.Link:
                     case SectionTypeEnum.Graph:
@@ -249,7 +238,7 @@ public async void ProcessNode(JToken node, JToken section = null)
 #endif
                 if (parsedSection != null)
                 {
-                    if (parsedSection.DelayInMs > 50 || showTyping) //Add 'typing' bubble if delay is grather than 50 ms
+                    if (parsedSection.DelayInMs > 50 || showTyping) //Add 'typing' bubble if delay is greater than 50 ms
                         ToggleTyping(true);
 
                     //Wait for delay MilliSeconds and then continue with chat
@@ -335,14 +324,39 @@ public async Task ProcessButtonsAsync(JToken node)
 
             ClearButtons();
             var allButtons = node["Buttons"].ToObject<List<Button>>();
-            foreach (var btn in allButtons.Where(x => x.Kind == ButtonKind.ClickInput))
+            foreach (var btnSrc in allButtons.Where(x => x.Kind == ButtonKind.ClickInput))
             {
-                btn.VariableName = node["VariableName"] + "";
-                btn.NodeId = parsedNode.Id;
-                btn.ButtonName = VerbProcessor.Process(btn.ButtonName);
-                btn.ButtonText = VerbProcessor.Process(btn.ButtonText);
-                CurrentClickButtons.Add(btn);
+                var btn = btnSrc.DeepCopy();
+                if (btn.DoesRepeat)
+                {
+                    var repeatOn = ButtonActionHelper.GetSavedArray(btn.RepeatOn);
+                    if (repeatOn != null)
+                    {
+                        var max = btn.MaxRepeats == 0 ? repeatOn.Count - 1 : btn.MaxRepeats;
+                        for (int i = btn.StartPosition; i <= max; i++)
+                        {
+                            var b = btn.DeepCopy();
+                            b.VariableName = node["VariableName"] + "";
+                            b.NodeId = parsedNode.Id;
+                            ButtonActionHelper.ClearSavedValue(b.RepeatAs);
+                            ButtonActionHelper.HandleSaveTextInput(b.RepeatAs, repeatOn[i] + "");
+                            b.ButtonName = VerbProcessor.Process(b.ButtonName, false);
+                            b.ButtonText = VerbProcessor.Process(b.ButtonText, false);
+                            ButtonActionHelper.ClearSavedValue(b.RepeatAs);
+                            CurrentClickButtons.Add(b);
+                        }
+                    }
+                }
+                else
+                {
+                    btn.VariableName = node["VariableName"] + "";
+                    btn.NodeId = parsedNode.Id;
+                    btn.ButtonName = VerbProcessor.Process(btn.ButtonName);
+                    btn.ButtonText = VerbProcessor.Process(btn.ButtonText);
+                    CurrentClickButtons.Add(btn);
+                }
             }
+
             foreach (var btn in allButtons.Where(x => x.Kind == ButtonKind.TextInput))
             {
                 btn.VariableName = node["VariableName"] + "";
@@ -379,7 +393,7 @@ public async Task ProcessButtonsAsync(JToken node)
                 };
                 buttonTimeoutTimer.Tick += (s, e) =>
                 {
-                    ClearButtons();
+                    //ClearButtons();
                     ClearButtonTimer();
                     defaultBtn.Action.Execute(defaultBtn);
                 };
@@ -541,41 +555,48 @@ public void AgentChat()
         private Socket socket;
         public void SetupSocketConnection()
         {
-            if (socket != null)
-                socket.Close();
-            Utils.APISettings.Values.TryGetValue("SocketServer", out object socketServer);
-            if (string.IsNullOrWhiteSpace(socketServer + ""))
-            {
-                Utils.ShowDialog("Socket Server is not set. Please go to Menu(...) -> Update APIs and set it.");
-                return;
-            }
-            socket = IO.Socket(socketServer + "", new IO.Options { Reconnection = true, AutoConnect = true });
-
-            socket.On(Socket.EVENT_CONNECT, () =>
+            try
             {
-                Debug.WriteLine("Connected");
-                socket.Emit("join", Utils.DeviceId);
-            });
+                if (socket != null)
+                    socket.Close();
+                Utils.APISettings.Values.TryGetValue("SocketServer", out object socketServer);
+                if (string.IsNullOrWhiteSpace(socketServer + ""))
+                {
+                    //Utils.ShowDialog("Socket Server is not set. Please go to Menu(...) -> Update APIs and set it.");
+                    return;
+                }
+                socket = IO.Socket(socketServer + "", new IO.Options { Reconnection = true, AutoConnect = true });
 
-            socket.On(Socket.EVENT_DISCONNECT, () =>
-            {
-                Debug.WriteLine("Disconnected");
-            });
+                socket.On(Socket.EVENT_CONNECT, () =>
+                {
+                    Debug.WriteLine("Connected");
+                    socket.Emit("join", Utils.DeviceId);
+                });
 
-            socket.On(Socket.EVENT_MESSAGE, (data) =>
-            {
-                var dataString = JsonConvert.SerializeObject(data, Formatting.Indented);
-                Debug.WriteLine(dataString);
+                socket.On(Socket.EVENT_DISCONNECT, () =>
+                {
+                    Debug.WriteLine("Disconnected");
+                });
 
-                Dispatcher.Dispatch(() =>
+                socket.On(Socket.EVENT_MESSAGE, (data) =>
                 {
-                    if (data is JObject jData)
+                    var dataString = JsonConvert.SerializeObject(data, Formatting.Indented);
+                    Debug.WriteLine(dataString);
+
+                    Dispatcher.Dispatch(() =>
                     {
-                        chatNodes.Add(jData);
-                        ProcessNode(jData);
-                    }
+                        if (data is JObject jData)
+                        {
+                            chatNodes.Add(jData);
+                            ProcessNode(jData);
+                        }
+                    });
                 });
-            });
+            }
+            catch (Exception ex)
+            {
+                //TODO: Handle error
+            }
         }
         #endregion
     }
diff --git a/ANAConversationSimulator/Views/MainPage.xaml b/ANAConversationSimulator/Views/MainPage.xaml
index 7f63890..e0a9539 100644
--- a/ANAConversationSimulator/Views/MainPage.xaml
+++ b/ANAConversationSimulator/Views/MainPage.xaml
@@ -23,13 +23,11 @@
                 </Grid>
             </controls:PageHeader.Content>
             <controls:PageHeader.SecondaryCommands>
-                <AppBarButton Click="{x:Bind Reset}" Label="Reset" />
-                <AppBarButton Click="{x:Bind ViewModel.UpdateAPI}" Label="Update APIs" />
+                <AppBarButton Click="{x:Bind ViewModel.Reset}" Label="Reset" />
+                <AppBarButton Click="{x:Bind ViewModel.UpdateAPI}" Label="Configure Chat Server" />
                 <AppBarButton Click="{x:Bind ViewModel.ShowMemoryStack}" Label="Show Memory Stack" />
                 <AppBarButton Click="{x:Bind ViewModel.AgentChat}" Label="Agent Chat" />
-                <AppBarSeparator />
-                <AppBarButton Click="{x:Bind SaveChatAsImageDefault}" Label="Save Snapshot" />
-                <AppBarButton Click="{x:Bind SaveChatAsImageWithName}" Label="Save Snapshot As.." />
+
             </controls:PageHeader.SecondaryCommands>
         </controls:PageHeader>
         <Grid x:Name="ContentGrid" RelativePanel.AlignLeftWithPanel="True" RelativePanel.AlignRightWithPanel="True" RelativePanel.AlignBottomWithPanel="True" RelativePanel.Below="pageHeader" Background="White">
diff --git a/ANAConversationStudio/ANAConversationStudio.csproj b/ANAConversationStudio/ANAConversationStudio.csproj
index 8633b50..fa6f1bb 100644
--- a/ANAConversationStudio/ANAConversationStudio.csproj
+++ b/ANAConversationStudio/ANAConversationStudio.csproj
@@ -40,34 +40,36 @@
     <ApplicationIcon>favicon.ico</ApplicationIcon>
   </PropertyGroup>
   <PropertyGroup>
-    <StartupObject>
-    </StartupObject>
+    <StartupObject>ANAConversationStudio.App</StartupObject>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="AdornedControl">
       <HintPath>..\ExternalBinaries\AdornedControl.dll</HintPath>
     </Reference>
-    <Reference Include="MongoDB.Bson, Version=2.4.3.23, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\MongoDB.Bson.2.4.3\lib\net45\MongoDB.Bson.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="MaterialDesignColors, Version=1.1.3.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\MaterialDesignColors.1.1.3\lib\net45\MaterialDesignColors.dll</HintPath>
     </Reference>
-    <Reference Include="MongoDB.Driver, Version=2.4.3.23, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\MongoDB.Driver.2.4.3\lib\net45\MongoDB.Driver.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="MaterialDesignThemes.Wpf, Version=2.3.0.823, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\MaterialDesignThemes.2.3.0.823\lib\net45\MaterialDesignThemes.Wpf.dll</HintPath>
     </Reference>
-    <Reference Include="MongoDB.Driver.Core, Version=2.4.3.23, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\MongoDB.Driver.Core.2.4.3\lib\net45\MongoDB.Driver.Core.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="MongoDB.Bson, Version=2.4.4.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\MongoDB.Bson.2.4.4\lib\net45\MongoDB.Bson.dll</HintPath>
+    </Reference>
+    <Reference Include="MongoDB.Driver, Version=2.4.4.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\MongoDB.Driver.2.4.4\lib\net45\MongoDB.Driver.dll</HintPath>
     </Reference>
-    <Reference Include="NetworkUI">
+    <Reference Include="MongoDB.Driver.Core, Version=2.4.4.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\MongoDB.Driver.Core.2.4.4\lib\net45\MongoDB.Driver.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="NetworkUI, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
       <HintPath>..\ExternalBinaries\NetworkUI.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.10.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <HintPath>..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="Serilog, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
-      <HintPath>..\packages\Serilog.2.4.0\lib\net45\Serilog.dll</HintPath>
-      <Private>True</Private>
+      <HintPath>..\packages\Serilog.2.5.0\lib\net45\Serilog.dll</HintPath>
     </Reference>
     <Reference Include="Serilog.Sinks.File, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
       <HintPath>..\packages\Serilog.Sinks.File.3.2.0\lib\net45\Serilog.Sinks.File.dll</HintPath>
@@ -98,29 +100,23 @@
     <Reference Include="WindowsBase" />
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
-    <Reference Include="Xceed.Wpf.AvalonDock, Version=3.0.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
-      <HintPath>..\packages\Extended.Wpf.Toolkit.3.0\lib\net40\Xceed.Wpf.AvalonDock.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Xceed.Wpf.AvalonDock, Version=3.1.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
+      <HintPath>..\packages\Extended.Wpf.Toolkit.3.1\lib\net40\Xceed.Wpf.AvalonDock.dll</HintPath>
     </Reference>
-    <Reference Include="Xceed.Wpf.AvalonDock.Themes.Aero, Version=3.0.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
-      <HintPath>..\packages\Extended.Wpf.Toolkit.3.0\lib\net40\Xceed.Wpf.AvalonDock.Themes.Aero.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Xceed.Wpf.AvalonDock.Themes.Aero, Version=3.1.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
+      <HintPath>..\packages\Extended.Wpf.Toolkit.3.1\lib\net40\Xceed.Wpf.AvalonDock.Themes.Aero.dll</HintPath>
     </Reference>
-    <Reference Include="Xceed.Wpf.AvalonDock.Themes.Metro, Version=3.0.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
-      <HintPath>..\packages\Extended.Wpf.Toolkit.3.0\lib\net40\Xceed.Wpf.AvalonDock.Themes.Metro.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Xceed.Wpf.AvalonDock.Themes.Metro, Version=3.1.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
+      <HintPath>..\packages\Extended.Wpf.Toolkit.3.1\lib\net40\Xceed.Wpf.AvalonDock.Themes.Metro.dll</HintPath>
     </Reference>
-    <Reference Include="Xceed.Wpf.AvalonDock.Themes.VS2010, Version=3.0.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
-      <HintPath>..\packages\Extended.Wpf.Toolkit.3.0\lib\net40\Xceed.Wpf.AvalonDock.Themes.VS2010.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Xceed.Wpf.AvalonDock.Themes.VS2010, Version=3.1.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
+      <HintPath>..\packages\Extended.Wpf.Toolkit.3.1\lib\net40\Xceed.Wpf.AvalonDock.Themes.VS2010.dll</HintPath>
     </Reference>
-    <Reference Include="Xceed.Wpf.DataGrid, Version=3.0.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
-      <HintPath>..\packages\Extended.Wpf.Toolkit.3.0\lib\net40\Xceed.Wpf.DataGrid.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Xceed.Wpf.DataGrid, Version=3.1.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
+      <HintPath>..\packages\Extended.Wpf.Toolkit.3.1\lib\net40\Xceed.Wpf.DataGrid.dll</HintPath>
     </Reference>
-    <Reference Include="Xceed.Wpf.Toolkit, Version=3.0.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
-      <HintPath>..\packages\Extended.Wpf.Toolkit.3.0\lib\net40\Xceed.Wpf.Toolkit.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Xceed.Wpf.Toolkit, Version=3.1.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
+      <HintPath>..\packages\Extended.Wpf.Toolkit.3.1\lib\net40\Xceed.Wpf.Toolkit.dll</HintPath>
     </Reference>
     <Reference Include="ZoomAndPan">
       <HintPath>..\ExternalBinaries\ZoomAndPan.dll</HintPath>
@@ -131,21 +127,31 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </ApplicationDefinition>
-    <Compile Include="Controls\ChatElementCollectionEditor.cs" />
-    <Compile Include="Controls\ChatNodeCollectionEditor.cs" />
-    <Compile Include="Controls\ChatContentCollectionControl.cs" />
-    <Compile Include="Controls\ChatNodeCollectionControl.cs" />
-    <Compile Include="Controls\ReadonlyTextBoxEditor.cs" />
-    <Compile Include="Helpers\MongoHelper.cs" />
+    <Compile Include="Helpers\ChatFlowBuilder.cs" />
+    <Compile Include="Views\NodeEditWindow.xaml.cs">
+      <DependentUpon>NodeEditWindow.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Helpers\StudioContext.cs" />
     <Compile Include="Helpers\Shortcuts.cs" />
+    <Compile Include="Models\Chat\ANAProject.cs" />
+    <Compile Include="Models\Chat\ChatFlowPack.cs" />
     <Compile Include="Models\Chat\Sections\PrintOTPSection.cs" />
     <Compile Include="Models\LayoutPoint.cs" />
+    <Compile Include="UIHelpers\ActionCommand.cs" />
+    <Compile Include="UIHelpers\ButtonSectionTypeSymbolConverter.cs" />
+    <Compile Include="UIHelpers\EditSectionTemplateSelector.cs" />
+    <Compile Include="UIHelpers\ObservableCollectionStringJoinConverter.cs" />
     <Compile Include="UIHelpers\NullToBoolConverter.cs" />
-    <Compile Include="Views\ChatElementCollectionEditorWindow.xaml.cs">
-      <DependentUpon>ChatElementCollectionEditorWindow.xaml</DependentUpon>
+    <Compile Include="UIHelpers\IsStartNodeToBrushConverter.cs" />
+    <Compile Include="UIHelpers\SelectionToFillBrushConverter.cs" />
+    <Compile Include="UserControls\TableRowUserControl.xaml.cs">
+      <DependentUpon>TableRowUserControl.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\ChatFlowsManagerWindow.xaml.cs">
+      <DependentUpon>ChatFlowsManagerWindow.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Views\DBConnectionManager.xaml.cs">
-      <DependentUpon>DBConnectionManager.xaml</DependentUpon>
+    <Compile Include="Views\SaveChatServersManager.xaml.cs">
+      <DependentUpon>SaveChatServersManager.xaml</DependentUpon>
     </Compile>
     <Compile Include="Helpers\Settings.cs" />
     <Compile Include="Helpers\Utilities.cs" />
@@ -169,7 +175,6 @@
     <Compile Include="Models\Chat\Sections\UrlSection.cs" />
     <Compile Include="Models\Chat\Sections\VideoSection.cs" />
     <Compile Include="UIHelpers\ScaleToPercentConverter.cs" />
-    <Compile Include="UIHelpers\BindingProxy.cs" />
     <Compile Include="UIHelpers\NullToVisibilityConverter.cs" />
     <Compile Include="UIHelpers\BindingToTypeNameConverter.cs" />
     <Compile Include="Views\EnterPassword.xaml.cs">
@@ -181,13 +186,25 @@
     <Compile Include="Views\SettingsWindow.xaml.cs">
       <DependentUpon>SettingsWindow.xaml</DependentUpon>
     </Compile>
-    <Page Include="Views\ChatElementCollectionEditorWindow.xaml">
+    <Page Include="Views\NodeEditWindow.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="Views\DBConnectionManager.xaml">
+    <Page Include="Styles\EditorTemplates.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="UserControls\TableRowUserControl.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Views\ChatFlowsManagerWindow.xaml">
+      <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Views\SaveChatServersManager.xaml">
       <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
     </Page>
     <Page Include="Views\EnterPassword.xaml">
       <SubType>Designer</SubType>
@@ -208,10 +225,6 @@
       <DependentUpon>MainWindow.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
-    <Page Include="Views\OverviewWindow.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
     <Page Include="Styles\SharedVisualTemplates.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -228,9 +241,6 @@
   <ItemGroup>
     <Compile Include="ViewModels\MainWindowViewModel.cs" />
     <Compile Include="Models\MouseHandlingMode.cs" />
-    <Compile Include="Views\OverviewWindow.xaml.cs">
-      <DependentUpon>OverviewWindow.xaml</DependentUpon>
-    </Compile>
     <Compile Include="Properties\AssemblyInfo.cs">
       <SubType>Code</SubType>
     </Compile>
@@ -247,6 +257,7 @@
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+      <SubType>Designer</SubType>
     </EmbeddedResource>
     <None Include="App.config" />
     <None Include="packages.config" />
@@ -255,6 +266,8 @@
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
     </None>
     <AppDesigner Include="Properties\" />
+    <Resource Include="Resources\segoe-mdl2-assets.ttf" />
+    <Resource Include="Resources\Gridlines.png" />
     <Content Include="Tools\extract.bat">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -272,6 +285,7 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </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.
diff --git a/ANAConversationStudio/App.xaml b/ANAConversationStudio/App.xaml
index 1f8eba5..3635f19 100644
--- a/ANAConversationStudio/App.xaml
+++ b/ANAConversationStudio/App.xaml
@@ -1,17 +1,76 @@
 <Application x:Class="ANAConversationStudio.App"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:local="clr-namespace:ANAConversationStudio"
              xmlns:UI="clr-namespace:ANAConversationStudio.UIHelpers"
              DispatcherUnhandledException="Application_DispatcherUnhandledException"
-             StartupUri="/Views/MainWindow.xaml">
+             Startup="Application_Startup"
+             StartupUri="/Views/MainWindow.xaml"
+             >
+
     <Application.Resources>
-        <Style TargetType="ListBoxItem" x:Key="ListBoxItemItemContainerStyle" >
-            <Setter Property="HorizontalContentAlignment" Value="Stretch" />
-        </Style>
-        <UI:BindingToTypeNameConverter x:Key="TypeName"/>
-        <UI:NullToVisibilityConverter x:Key="N2V"/>
-        <UI:NullToBoolConverter x:Key="N2B"/>
-        
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Light.xaml" />
+                <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Defaults.xaml" />
+                <ResourceDictionary Source="/Styles/EditorTemplates.xaml" />
+            </ResourceDictionary.MergedDictionaries>
+
+            <FontFamily x:Key="MDL2Assets">pack://application:,,,/Resources/#Segoe MDL2 Assets</FontFamily>
+
+            <Style TargetType="{x:Type Window}">
+                <Setter Property="FontFamily" Value="Century Gothic" />
+            </Style>
+
+            <Style TargetType="ListBoxItem" x:Key="ListBoxItemItemContainerStyle" >
+                <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+            </Style>
+            <UI:BindingToTypeNameConverter x:Key="TypeName"/>
+            <UI:NullToVisibilityConverter x:Key="N2V"/>
+            <UI:NullToBoolConverter x:Key="N2B"/>
+            <BooleanToVisibilityConverter x:Key="B2V"/>
+
+            <UI:SelectionToFillBrushConverter x:Key="SelectionToFillBrushConverter"/>
+            <UI:IsStartNodeToBrushConverter x:Key="IsStartNodeToBrushConverter"/>
+            <SolidColorBrush x:Key="connectionBrush" Color="#707070" />
+            <SolidColorBrush x:Key="connectionHighlightedBrush" Color="#AD4833" />
+
+            <SolidColorBrush Color="LightGray" x:Key="GridDotBrush"/>
+            <SolidColorBrush Color="LightGray" x:Key="GridDotBorderBrush"/>
+
+            <!--Dots-->
+            <Grid Width="100" Height="100" x:Key="vBrushBack">
+                <Border Width="10" Height="10" CornerRadius="100" VerticalAlignment="Top" HorizontalAlignment="Left"  Background="{StaticResource GridDotBrush}"/>
+                <Border Opacity="0" Width="10" Height="10" CornerRadius="100" VerticalAlignment="Bottom" HorizontalAlignment="Left" Background="{StaticResource GridDotBrush}"/>
+                <Border Opacity="0" Width="10" Height="10" CornerRadius="100" VerticalAlignment="Top" HorizontalAlignment="Right" BorderThickness="1" BorderBrush="{StaticResource GridDotBorderBrush}" Background="{StaticResource GridDotBrush}"/>
+                <Border Opacity="0" Width="10" Height="10" CornerRadius="100" VerticalAlignment="Bottom" HorizontalAlignment="Left" BorderThickness="1" BorderBrush="{StaticResource GridDotBorderBrush}" Background="{StaticResource GridDotBrush}"/>
+            </Grid>
+
+            <VisualBrush x:Key="GridlinesVBrush" TileMode="Tile" 
+            Viewport="0,0,25,25"
+            ViewportUnits="Absolute" Visual="{StaticResource vBrushBack}"/>
+
+            <!-- primary hues  -->
+            <SolidColorBrush x:Key="PrimaryHueLightBrush" Color="#ccc"/>
+            <SolidColorBrush x:Key="PrimaryHueLightForegroundBrush" Color="Black"/>
+            <SolidColorBrush x:Key="PrimaryHueMidBrush" Color="Gray"/>
+            <SolidColorBrush x:Key="PrimaryHueMidForegroundBrush" Color="White"/>
+            <SolidColorBrush x:Key="PrimaryHueDarkBrush" Color="Gray"/>
+            <SolidColorBrush x:Key="PrimaryHueDarkForegroundBrush" Color="White"/>
+            <!--  accent -->
+            <SolidColorBrush x:Key="SecondaryAccentBrush" Color="Crimson"/>
+            <SolidColorBrush x:Key="SecondaryAccentForegroundBrush" Color="White"/>
+
+            <SolidColorBrush x:Key="FileMenuForegroundBrush" Color="#DD000000" />
+
+            <!-- Chat Designer Colors -->
+            <!-- The border brush for nodes. -->
+            <SolidColorBrush x:Key="nodeBorderBrush" Color="Transparent" />
+            <SolidColorBrush x:Key="startNodeBorderBrush" Color="{Binding Color, Source={StaticResource PrimaryHueDarkBrush}}" />
+            <SolidColorBrush x:Key="nodeHeaderBorderBrush" Color="{Binding Color, Source={StaticResource PrimaryHueDarkBrush}}" />
+            <!-- The fill brush for nodes. -->
+            <SolidColorBrush x:Key="nodeFillBrush" Color="{Binding Color, Source={StaticResource PrimaryHueLightBrush}}"/>
+            <SolidColorBrush x:Key="selectionBorderColor" Color="Transparent" />
+            <SolidColorBrush x:Key="selectionBorderBackgroundColor" Color="{Binding Color, Source={StaticResource PrimaryHueLightBrush}}" Opacity="0.5" />
+        </ResourceDictionary>
     </Application.Resources>
 </Application>
diff --git a/ANAConversationStudio/App.xaml.cs b/ANAConversationStudio/App.xaml.cs
index 3d6354d..7bc230b 100644
--- a/ANAConversationStudio/App.xaml.cs
+++ b/ANAConversationStudio/App.xaml.cs
@@ -1,11 +1,13 @@
 using ANAConversationStudio.Helpers;
+using ANAConversationStudio.Models;
+using ANAConversationStudio.Models.Chat.Sections;
+using MongoDB.Bson;
+using MongoDB.Bson.Serialization;
+using MongoDB.Bson.Serialization.Conventions;
 using System.Windows;
 
 namespace ANAConversationStudio
 {
-    /// <summary>
-    /// Interaction logic for App.xaml
-    /// </summary>
     public partial class App : Application
     {
         private void Application_DispatcherUnhandledException(object sender, System.Windows.Threading.DispatcherUnhandledExceptionEventArgs e)
@@ -15,5 +17,67 @@ private void Application_DispatcherUnhandledException(object sender, System.Wind
             MessageBox.Show(e.Exception.StackTrace, e.Exception.Message);
         }
         public static string Cryptio { get; set; }
+
+        private void Application_Startup(object sender, StartupEventArgs e)
+        {
+            #region Initialize Mongo Parser Maps
+            ConventionRegistry.Register(typeof(IgnoreExtraElementsConvention).Name, new ConventionPack { new IgnoreExtraElementsConvention(true) }, t => true);
+            ConventionRegistry.Register("EnumStringConvention", new ConventionPack { new EnumRepresentationConvention(BsonType.String) }, t => true);
+            if (!BsonClassMap.IsClassMapRegistered(typeof(GifSection)))
+                BsonClassMap.RegisterClassMap<GifSection>();
+
+            if (!BsonClassMap.IsClassMapRegistered(typeof(TextSection)))
+                BsonClassMap.RegisterClassMap<TextSection>();
+
+            if (!BsonClassMap.IsClassMapRegistered(typeof(ImageSection)))
+                BsonClassMap.RegisterClassMap<ImageSection>();
+
+            if (!BsonClassMap.IsClassMapRegistered(typeof(AudioSection)))
+                BsonClassMap.RegisterClassMap<AudioSection>();
+
+            if (!BsonClassMap.IsClassMapRegistered(typeof(VideoSection)))
+                BsonClassMap.RegisterClassMap<VideoSection>();
+
+            if (!BsonClassMap.IsClassMapRegistered(typeof(EmbeddedHtmlSection)))
+                BsonClassMap.RegisterClassMap<EmbeddedHtmlSection>();
+
+            if (!BsonClassMap.IsClassMapRegistered(typeof(CarouselSection)))
+                BsonClassMap.RegisterClassMap<CarouselSection>();
+
+            if (!BsonClassMap.IsClassMapRegistered(typeof(NodeContent)))
+                BsonClassMap.RegisterClassMap<NodeContent>();
+
+            if (!BsonClassMap.IsClassMapRegistered(typeof(SectionContent)))
+                BsonClassMap.RegisterClassMap<SectionContent>();
+
+            if (!BsonClassMap.IsClassMapRegistered(typeof(TextSectionContent)))
+                BsonClassMap.RegisterClassMap<TextSectionContent>();
+
+            if (!BsonClassMap.IsClassMapRegistered(typeof(TitleCaptionSectionContent)))
+                BsonClassMap.RegisterClassMap<TitleCaptionSectionContent>();
+
+            if (!BsonClassMap.IsClassMapRegistered(typeof(GraphSectionContent)))
+                BsonClassMap.RegisterClassMap<GraphSectionContent>();
+
+            if (!BsonClassMap.IsClassMapRegistered(typeof(ButtonContent)))
+                BsonClassMap.RegisterClassMap<ButtonContent>();
+
+            if (!BsonClassMap.IsClassMapRegistered(typeof(PrintOTPSection)))
+                BsonClassMap.RegisterClassMap<PrintOTPSection>();
+
+            if (!BsonClassMap.IsClassMapRegistered(typeof(CarouselButtonContent)))
+                BsonClassMap.RegisterClassMap<CarouselButtonContent>();
+
+            if (!BsonClassMap.IsClassMapRegistered(typeof(CarouselItemContent)))
+                BsonClassMap.RegisterClassMap<CarouselItemContent>();
+            #endregion
+
+            #region This applies the default font
+            FrameworkElement.StyleProperty.OverrideMetadata(typeof(Window), new FrameworkPropertyMetadata
+            {
+                DefaultValue = FindResource(typeof(Window))
+            });
+            #endregion
+        }
     }
 }
diff --git a/ANAConversationStudio/Controls/ChatContentCollectionControl.cs b/ANAConversationStudio/Controls/ChatContentCollectionControl.cs
deleted file mode 100644
index 3d51501..0000000
--- a/ANAConversationStudio/Controls/ChatContentCollectionControl.cs
+++ /dev/null
@@ -1,132 +0,0 @@
-using MongoDB.Bson;
-using ANAConversationStudio.Models;
-using ANAConversationStudio.Models.Chat;
-using ANAConversationStudio.Helpers;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Windows;
-using Xceed.Wpf.Toolkit;
-using ANAConversationStudio.Models.Chat.Sections;
-
-namespace ANAConversationStudio.Controls
-{
-    public class ChatContentCollectionControl : CollectionControl
-    {
-        public ChatNode ParentChatNode
-        {
-            get { return (ChatNode)GetValue(ParentChatNodeProperty); }
-            set { SetValue(ParentChatNodeProperty, value); }
-        }
-        public static readonly DependencyProperty ParentChatNodeProperty = DependencyProperty.Register(nameof(ParentChatNode), typeof(ChatNode), typeof(ChatContentCollectionControl), new PropertyMetadata((s, e) =>
-        {
-            var control = s as ChatContentCollectionControl;
-            if (e.NewValue == null)
-                control.Visibility = Visibility.Collapsed;
-            else
-                control.Visibility = Visibility.Visible;
-        }));
-        public object ChatContentOwner
-        {
-            get { return (object)GetValue(ChatContentOwnerProperty); }
-            set { SetValue(ChatContentOwnerProperty, value); }
-        }
-        public static readonly DependencyProperty ChatContentOwnerProperty = DependencyProperty.Register(nameof(ChatContentOwner), typeof(object), typeof(ChatContentCollectionControl), new PropertyMetadata((s, e) =>
-        {
-            var control = s as ChatContentCollectionControl;
-
-            var choosenOwnerObject = e.NewValue;
-            if (choosenOwnerObject != null)
-            {
-                var contentObject = Utilities.GetContentObjectV2(choosenOwnerObject);
-                if (contentObject != null)
-                {
-                    var contentBank = Utilities.GetContentBank(choosenOwnerObject);
-                    control.NewItemTypes = new List<Type>() { contentObject.GetType() };
-                    control.Items.Clear();
-                    control.ItemsSource = null;
-                    control.ItemsSource = contentBank;
-                    control.ItemsSourceType = contentBank.GetType();
-                    control.Margin = new Thickness(10);
-                    control.Visibility = Visibility.Visible;
-                    if (control.Items.Count > 0)
-                        control.SelectedItem = control.Items.First();
-                    else
-                        control.SelectedItem = null;
-                }
-                else
-                    control.Visibility = Visibility.Collapsed;
-            }
-            else
-                control.Visibility = Visibility.Collapsed;
-        }));
-        public ChatContentCollectionControl()
-        {
-            ItemAdding += ItemAddingEventHandler;
-            ItemAdded += ItemAddedEventHandler;
-            ItemDeleted += ItemDeletedEventHandler;
-        }
-        public void ContentItemAddExternal(BaseContent item)
-        {
-            if (item == null) return;
-            PreProccessAddingItem(item);
-            Items.Add(item);
-            ContentItemAdded(item);
-        }
-        public void ContentItemDeleted(BaseContent item)
-        {
-            if (item == null) return;
-            var content = MongoHelper.Current.Contents.FirstOrDefault(x => x._id == item._id);
-            if (content != null)
-                MongoHelper.Current.Contents.Remove(content);
-        }
-
-        private void ItemDeletedEventHandler(object sender, ItemEventArgs e)
-        {
-            ContentItemDeleted(e.Item as BaseContent);
-        }
-        private void ItemAddedEventHandler(object sender, ItemEventArgs e)
-        {
-            ContentItemAdded(e.Item as BaseContent);
-        }
-        private void ItemAddingEventHandler(object sender, ItemAddingEventArgs e)
-        {
-            PreProccessAddingItem(e.Item);
-        }
-        private void PreProccessAddingItem(object item)
-        {
-            if (item is BaseIdEntity)
-                (item as BaseIdEntity)._id = ObjectId.GenerateNewId().ToString();
-            if (item is BaseEntity)
-                (item as BaseEntity).Alias = "New " + item.GetType().Name;
-
-            if (item is BaseIdTimeStampEntity)
-            {
-                (item as BaseIdTimeStampEntity).CreatedOn = DateTime.Now;
-                (item as BaseIdTimeStampEntity).UpdatedOn = DateTime.Now;
-            }
-
-            if (item is BaseContent && ParentChatNode != null)
-                (item as BaseContent).NodeId = ParentChatNode.Id;
-
-            if ((item is SectionContent || item is ButtonContent) && ChatContentOwner != null)
-            {
-                if (ChatContentOwner is Section && item is SectionContent)
-                    (item as SectionContent).SectionId = (ChatContentOwner as Section)._id;
-                else if (ChatContentOwner is Button && item is ButtonContent)
-                    (item as ButtonContent).ButtonId = (ChatContentOwner as Button)._id;
-            }
-
-            if (item is CarouselButtonContent cBtnContent && ChatContentOwner != null && ChatContentOwner is CarouselButton cBtn)
-                cBtnContent.CarouselButtonId = cBtn._id;
-
-            if (item is CarouselItemContent cItemContent && ChatContentOwner != null && ChatContentOwner is CarouselItem cItem)
-                cItemContent.CarouselItemId = cItem._id;
-        }
-        private void ContentItemAdded(BaseContent item)
-        {
-            if (item == null) return;
-            MongoHelper.Current.Contents.Add(item as BaseContent);
-        }
-    }
-}
diff --git a/ANAConversationStudio/Controls/ChatElementCollectionEditor.cs b/ANAConversationStudio/Controls/ChatElementCollectionEditor.cs
deleted file mode 100644
index a641e42..0000000
--- a/ANAConversationStudio/Controls/ChatElementCollectionEditor.cs
+++ /dev/null
@@ -1,139 +0,0 @@
-using MongoDB.Bson;
-using ANAConversationStudio.Models;
-using ANAConversationStudio.Views;
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Windows;
-using System.Windows.Controls;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using System.Threading.Tasks;
-
-namespace ANAConversationStudio.Controls
-{
-    public class ChatElementCollectionEditor<T> : TypeEditor<Button>
-    {
-        protected override void SetValueDependencyProperty()
-        {
-            ValueProperty = CollectionControlButton.ItemsSourceProperty;
-        }
-        private PropertyItem _propertyItem;
-        private ChatNodeCollectionControl _collectionControl;
-        private ChatElementCollectionEditorWindow editorWindow;
-        protected override void ResolveValueBinding(PropertyItem propertyItem)
-        {
-            _propertyItem = propertyItem;
-            _collectionControl = new ChatNodeCollectionControl()
-            {
-                ItemsSource = _propertyItem.Value as IEnumerable,
-                ItemsSourceType = _propertyItem.PropertyType,
-                Margin = new Thickness(10),
-                OwnerChatNode = propertyItem.Instance as Models.Chat.ChatNode,
-                NewItemTypes = _propertyItem.PropertyDescriptor.Attributes.Cast<Attribute>().Where(x => x is NewItemTypesAttribute).Cast<NewItemTypesAttribute>().SelectMany(x => x.Types).ToList()
-            };
-
-            if (_collectionControl.NewItemTypes == null || _collectionControl.NewItemTypes.Count == 0)
-            {
-                if (_propertyItem.PropertyType.BaseType == typeof(Array))
-                    _collectionControl.NewItemTypes = new List<Type>() { _propertyItem.PropertyType.GetElementType() };
-                else if (_propertyItem.PropertyType.GetGenericArguments().Count() > 0)
-                    _collectionControl.NewItemTypes = new List<Type>() { _propertyItem.PropertyType.GetGenericArguments()[0] };
-            }
-
-            _collectionControl.Loaded += _collectionControl_Loaded;
-            _collectionControl.ItemAdding += ItemAdding;
-            _collectionControl.ItemAdded += ItemAddedAsync;
-            _collectionControl.ItemDeleted += ItemCollectionChanged;
-            _collectionControl.ItemMovedDown += ItemCollectionChanged;
-            _collectionControl.ItemMovedUp += ItemCollectionChanged;
-
-            Editor.Content = "Edit";
-            Editor.Click += (s, e) =>
-            {
-                InvalidatePropertyGrid();
-                if (editorWindow != null)
-                {
-                    editorWindow.Close();
-                    editorWindow = null;
-                }
-                editorWindow = new ChatElementCollectionEditorWindow(_collectionControl);
-                editorWindow.ShowDialog();
-            };
-            base.ResolveValueBinding(_propertyItem);
-        }
-
-        private async void ItemAddedAsync(object sender, ItemEventArgs e)
-        {
-            InvalidateSource();
-            await Application.Current.Dispatcher.InvokeAsync(() =>
-            {
-                var editor = editorWindow.ChatElementContentCollectionEditor;
-                if (editor != null && editor.NewItemTypes?.Count > 0 && editor.Items.Count == 0)
-                {
-                    var newItem = Activator.CreateInstance(editor.NewItemTypes.First());
-                    editor.ContentItemAddExternal(newItem as BaseContent);
-                    editor.SelectedItem = newItem;
-                }
-            });
-        }
-
-        private void _collectionControl_Loaded(object sender, RoutedEventArgs e)
-        {
-            _collectionControl.PropertyGrid.PropertyValueChanged -= PropertyGrid_PropertyValueChanged;
-            _collectionControl.PropertyGrid.PropertyValueChanged += PropertyGrid_PropertyValueChanged;
-        }
-
-        private void PropertyGrid_PropertyValueChanged(object sender, PropertyValueChangedEventArgs e)
-        {
-            InvalidateSource();
-
-            if ((e.Source as PropertyGrid).SelectedObject is BaseEntity bEntity && (e.OriginalSource is PropertyItem pItem))
-            {
-                if (pItem.PropertyName == nameof(bEntity.Alias)) //If name of the property changed is 'Alias'
-                {
-                    var editor = editorWindow.ChatElementContentCollectionEditor;
-                    if (editor.SelectedItem != null) //copy alias to content only when 1 content is present
-                    {
-                        if (editor.SelectedItem is ButtonContent bContent && string.IsNullOrWhiteSpace(bContent.ButtonText))
-                            bContent.ButtonText = e.NewValue as string;
-                        else if (editor.SelectedItem is TextSectionContent txtContent && string.IsNullOrWhiteSpace(txtContent.SectionText))
-                            txtContent.SectionText = e.NewValue as string;
-                        else if (editor.SelectedItem is CarouselButtonContent cBtnContent && string.IsNullOrWhiteSpace(cBtnContent.ButtonText))
-                            cBtnContent.ButtonText = e.NewValue as string;
-                        else if (editor.SelectedItem is CarouselItemContent cItemContent && string.IsNullOrWhiteSpace(cItemContent.Title))
-                            cItemContent.Title = e.NewValue as string;
-                    }
-                }
-            }
-        }
-        private void InvalidatePropertyGrid()
-        {
-            if (_collectionControl.PropertyGrid != null && _collectionControl.PropertyGrid.SelectedObject != null)
-                _collectionControl.PropertyGrid.Update();
-        }
-        private void InvalidateSource()
-        {
-            _propertyItem.Value = new ObservableCollection<T>(_collectionControl.Items.Cast<T>());
-        }
-
-        private void ItemAdding(object sender, ItemAddingEventArgs e)
-        {
-            var Item = e.Item;
-
-            if (Item is BaseIdEntity)
-                (Item as BaseIdEntity)._id = ObjectId.GenerateNewId().ToString();
-            if (Item is BaseEntity)
-                (Item as BaseEntity).Alias = "New " + Item.GetType().Name;
-        }
-
-        private void ItemCollectionChanged(object sender, ItemEventArgs e)
-        {
-            InvalidateSource();
-        }
-    }
-}
\ No newline at end of file
diff --git a/ANAConversationStudio/Controls/ChatNodeCollectionControl.cs b/ANAConversationStudio/Controls/ChatNodeCollectionControl.cs
deleted file mode 100644
index 8ca5f01..0000000
--- a/ANAConversationStudio/Controls/ChatNodeCollectionControl.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using System.Windows;
-using Xceed.Wpf.Toolkit;
-
-namespace ANAConversationStudio.Controls
-{
-    public class ChatNodeCollectionControl : CollectionControl
-    {
-        public Models.Chat.ChatNode OwnerChatNode
-        {
-            get { return (Models.Chat.ChatNode)GetValue(OwnerChatNodeProperty); }
-            set { SetValue(OwnerChatNodeProperty, value); }
-        }
-        public static readonly DependencyProperty OwnerChatNodeProperty = DependencyProperty.Register(nameof(OwnerChatNode), typeof(Models.Chat.ChatNode), typeof(ChatContentCollectionControl), new PropertyMetadata(null));
-    }
-}
diff --git a/ANAConversationStudio/Controls/ChatNodeCollectionEditor.cs b/ANAConversationStudio/Controls/ChatNodeCollectionEditor.cs
deleted file mode 100644
index f666867..0000000
--- a/ANAConversationStudio/Controls/ChatNodeCollectionEditor.cs
+++ /dev/null
@@ -1,136 +0,0 @@
-using MongoDB.Bson;
-using ANAConversationStudio.Models;
-using ANAConversationStudio.Views;
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Windows;
-using System.Windows.Controls;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using System.Threading.Tasks;
-
-namespace ANAConversationStudio.Controls
-{
-    public class ChatNodeCollectionEditor<T> : TypeEditor<Button>
-    {
-        protected override void SetValueDependencyProperty()
-        {
-            ValueProperty = CollectionControlButton.ItemsSourceProperty;
-        }
-        private PropertyItem _propertyItem;
-        private ChatNodeCollectionControl _collectionControl;
-        protected override void ResolveValueBinding(PropertyItem propertyItem)
-        {
-            _propertyItem = propertyItem;
-            _collectionControl = new ChatNodeCollectionControl()
-            {
-                ItemsSource = _propertyItem.Value as IEnumerable,
-                ItemsSourceType = _propertyItem.PropertyType,
-                Margin = new Thickness(10),
-                OwnerChatNode = propertyItem.Instance as Models.Chat.ChatNode,
-                NewItemTypes = _propertyItem.PropertyDescriptor.Attributes.Cast<Attribute>().Where(x => x is NewItemTypesAttribute).Cast<NewItemTypesAttribute>().SelectMany(x => x.Types).ToList()
-            };
-
-            if (_collectionControl.NewItemTypes == null || _collectionControl.NewItemTypes.Count == 0)
-            {
-                if (_propertyItem.PropertyType.BaseType == typeof(Array))
-                    _collectionControl.NewItemTypes = new List<Type>() { _propertyItem.PropertyType.GetElementType() };
-                else if (_propertyItem.PropertyType.GetGenericArguments().Count() > 0)
-                    _collectionControl.NewItemTypes = new List<Type>() { _propertyItem.PropertyType.GetGenericArguments()[0] };
-            }
-
-            _collectionControl.Loaded += _collectionControl_Loaded;
-            _collectionControl.ItemAdding += ItemAdding;
-            _collectionControl.ItemAdded += ItemAddedAsync;
-            _collectionControl.ItemDeleted += ItemCollectionChanged;
-            _collectionControl.ItemMovedDown += ItemCollectionChanged;
-            _collectionControl.ItemMovedUp += ItemCollectionChanged;
-
-            Editor.Content = "Edit";
-            Editor.Click += (s, e) =>
-            {
-                InvalidatePropertyGrid();
-                MainWindow.Current.NodeCollectionControl = _collectionControl;
-                if (MainWindow.Current.SectionButtonEditorLayoutAnchorable != null)
-                    MainWindow.Current.SectionButtonEditorLayoutAnchorable.IsActive = true;
-            };
-            base.ResolveValueBinding(_propertyItem);
-        }
-
-        private async void ItemAddedAsync(object sender, ItemEventArgs e)
-        {
-            InvalidateSource();
-            await Application.Current.Dispatcher.InvokeAsync(() =>
-            {
-                var editor = MainWindow.Current.ChatContentCollectionEditor;
-                if (editor != null && editor.NewItemTypes?.Count > 0 && editor.Items.Count == 0)
-                {
-                    var newItem = Activator.CreateInstance(editor.NewItemTypes.First());
-                    editor.ContentItemAddExternal(newItem as BaseContent);
-                    editor.SelectedItem = newItem;
-                }
-            });
-        }
-
-        private void _collectionControl_Loaded(object sender, RoutedEventArgs e)
-        {
-            _collectionControl.PropertyGrid.PropertyValueChanged -= PropertyGrid_PropertyValueChanged;
-            _collectionControl.PropertyGrid.PropertyValueChanged += PropertyGrid_PropertyValueChanged;
-        }
-
-        private void PropertyGrid_PropertyValueChanged(object sender, PropertyValueChangedEventArgs e)
-        {
-            InvalidateSource();
-
-            if ((e.Source as PropertyGrid).SelectedObject is BaseEntity bEntity && (e.OriginalSource is PropertyItem pItem))
-            {
-                if (pItem.PropertyName == nameof(bEntity.Alias)) //If name of the property changed is 'Alias'
-                {
-                    var editor = MainWindow.Current.ChatContentCollectionEditor;
-                    if (editor.SelectedItem != null) //copy alias to content only when 1 content is present
-                    {
-                        if (editor.SelectedItem is ButtonContent bContent && string.IsNullOrWhiteSpace(bContent.ButtonText))
-                            bContent.ButtonText = e.NewValue as string;
-                        else if (editor.SelectedItem is TextSectionContent txtContent && string.IsNullOrWhiteSpace(txtContent.SectionText))
-                            txtContent.SectionText = e.NewValue as string;
-                        else if (editor.SelectedItem is TitleCaptionSectionContent titleCaptionSectionContent && string.IsNullOrWhiteSpace(titleCaptionSectionContent.Title))
-                            titleCaptionSectionContent.Title = e.NewValue as string;
-                        else if (editor.SelectedItem is CarouselButtonContent cBtnContent && string.IsNullOrWhiteSpace(cBtnContent.ButtonText))
-                            cBtnContent.ButtonText = e.NewValue as string;
-                        else if (editor.SelectedItem is CarouselItemContent cItemContent && string.IsNullOrWhiteSpace(cItemContent.Title))
-                            cItemContent.Title = e.NewValue as string;
-                    }
-                }
-            }
-        }
-        private void InvalidatePropertyGrid()
-        {
-            if (_collectionControl.PropertyGrid != null && _collectionControl.PropertyGrid.SelectedObject != null)
-                _collectionControl.PropertyGrid.Update();
-        }
-        private void InvalidateSource()
-        {
-            _propertyItem.Value = new ObservableCollection<T>(_collectionControl.Items.Cast<T>());
-        }
-
-        private void ItemAdding(object sender, ItemAddingEventArgs e)
-        {
-            var Item = e.Item;
-
-            if (Item is BaseIdEntity)
-                (Item as BaseIdEntity)._id = ObjectId.GenerateNewId().ToString();
-            if (Item is BaseEntity)
-                (Item as BaseEntity).Alias = "New " + Item.GetType().Name;
-        }
-
-        private void ItemCollectionChanged(object sender, ItemEventArgs e)
-        {
-            InvalidateSource();
-        }
-    }
-}
\ No newline at end of file
diff --git a/ANAConversationStudio/Controls/CurvedArrow.cs b/ANAConversationStudio/Controls/CurvedArrow.cs
index b7c4ac3..d42e786 100644
--- a/ANAConversationStudio/Controls/CurvedArrow.cs
+++ b/ANAConversationStudio/Controls/CurvedArrow.cs
@@ -131,7 +131,7 @@ private void GenerateArrowHeadGeometry(GeometryGroup geometryGroup)
             arrowHeadFig.StartPoint = arrowHeadPoints[0];
             arrowHeadFig.Segments.Add(new LineSegment(arrowHeadPoints[1], true));
             arrowHeadFig.Segments.Add(new LineSegment(arrowHeadPoints[2], true));
-
+            
             PathGeometry pathGeometry = new PathGeometry();
             pathGeometry.Figures.Add(arrowHeadFig);
 
diff --git a/ANAConversationStudio/Controls/ReadonlyTextBoxEditor.cs b/ANAConversationStudio/Controls/ReadonlyTextBoxEditor.cs
deleted file mode 100644
index c652d4c..0000000
--- a/ANAConversationStudio/Controls/ReadonlyTextBoxEditor.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Controls;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-
-namespace ANAConversationStudio.Controls
-{
-    public class ReadonlyTextBoxEditor : TextBoxEditor
-    {
-        public override FrameworkElement ResolveEditor(PropertyItem propertyItem)
-        {
-            var editor = base.ResolveEditor(propertyItem);
-            (editor as TextBox).IsReadOnly = true;
-            (editor as TextBox).IsReadOnlyCaretVisible = true;
-            return editor;
-        }
-    }
-}
diff --git a/ANAConversationStudio/Helpers/ChatFlowBuilder.cs b/ANAConversationStudio/Helpers/ChatFlowBuilder.cs
new file mode 100644
index 0000000..3741092
--- /dev/null
+++ b/ANAConversationStudio/Helpers/ChatFlowBuilder.cs
@@ -0,0 +1,166 @@
+using MongoDB.Driver;
+using ANAConversationStudio.Models;
+using ANAConversationStudio.Models.Chat;
+using ANAConversationStudio.Models.Chat.Sections;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using System.Collections.Concurrent;
+using System.Diagnostics;
+
+namespace ANAConversationStudio.Helpers
+{
+    public static class ChatFlowBuilder
+    {
+        public static List<ChatNode> Build(ChatFlowPack chatFlow)
+        {
+            try
+            {
+                var filter = Builders<ChatFlowPack>.Filter;
+
+                var nodesList = new ConcurrentBag<ChatNode>(chatFlow.ChatNodes);
+                var content = new ConcurrentBag<BaseContent>(chatFlow.ChatContent);
+                Parallel.ForEach(nodesList, chatNode =>
+                {
+                    try
+                    {
+                        foreach (Section section in chatNode.Sections)
+                            FillSectionWithContent(section, content);
+                        foreach (Button button in chatNode.Buttons)
+                            button.ButtonText = content.GetFor(button)?.ButtonText;
+                    }
+                    catch (Exception ex)
+                    {
+                        Logger.Write(ex);
+                    }
+                });
+
+                var startNode = nodesList.FirstOrDefault(x => x.IsStartNode);
+                if (startNode != null) //If start chat node is present, move it up
+                {
+                    var result = nodesList.Where(x => x != startNode).ToList();
+                    result.Insert(0, startNode);
+                    return result;
+                }
+                return nodesList.ToList();
+            }
+            catch (Exception ex)
+            {
+                Logger.Write(ex);
+            }
+            return null;
+        }
+
+        private static readonly Random rand = new Random();
+        private static void FillSectionWithContent(Section emptySection, ConcurrentBag<BaseContent> contents)
+        {
+            switch (emptySection.SectionType)
+            {
+                case SectionTypeEnum.Image:
+                case SectionTypeEnum.Gif:
+                    var imgSection = emptySection as ImageSection;
+                    var imgContent = contents.GetFor(imgSection) as TitleCaptionSectionContent;
+                    if (imgContent != null)
+                    {
+                        imgSection.Title = imgContent.Title;
+                        imgSection.Caption = imgContent.Caption;
+                        imgSection.ContentId = imgContent._id;
+                    }
+                    break;
+
+                case SectionTypeEnum.Text:
+                    var textSection = emptySection as TextSection;
+                    var textContent = contents.GetFor(textSection) as TextSectionContent;
+                    if (textContent != null)
+                    {
+                        textSection.Text = textContent.SectionText;
+                        textSection.ContentId = textSection._id;
+                    }
+                    break;
+
+                case SectionTypeEnum.Audio:
+                    var audioSection = emptySection as AudioSection;
+                    var audioContent = contents.GetFor(audioSection) as TitleCaptionSectionContent;
+                    if (audioContent != null)
+                    {
+                        audioSection.Title = audioContent.Title;
+                        audioSection.Caption = audioContent.Caption;
+                        audioSection.ContentId = audioContent._id;
+                    }
+                    break;
+
+                case SectionTypeEnum.Video:
+                    var videoSection = emptySection as VideoSection;
+                    var videoContent = contents.GetFor(videoSection) as TitleCaptionSectionContent;
+                    if (videoContent != null)
+                    {
+                        videoSection.Title = videoContent.Title;
+                        videoSection.Caption = videoContent.Caption;
+                        videoSection.ContentId = videoContent._id;
+                    }
+                    break;
+
+                case SectionTypeEnum.EmbeddedHtml:
+                    var embeddedHtmlSection = emptySection as EmbeddedHtmlSection;
+                    var embeddedHtmlContent = contents.GetFor(embeddedHtmlSection) as TitleCaptionSectionContent;
+                    if (embeddedHtmlContent != null)
+                    {
+                        embeddedHtmlSection.Title = embeddedHtmlContent.Title;
+                        embeddedHtmlSection.Caption = embeddedHtmlContent.Caption;
+                        embeddedHtmlSection.ContentId = embeddedHtmlContent._id;
+                    }
+                    break;
+
+                case SectionTypeEnum.Carousel:
+                    var carouselSection = emptySection as CarouselSection;
+                    var carContent = contents.GetFor(carouselSection) as TitleCaptionSectionContent;
+                    if (carContent != null)
+                    {
+                        carouselSection.Title = carContent.Title;
+                        carouselSection.Caption = carContent.Caption;
+                        carouselSection.ContentId = carContent._id;
+                    }
+                    if (carouselSection.Items != null)
+                        foreach (var carItem in carouselSection.Items)
+                        {
+                            var content = contents.GetFor(carItem);
+                            if (content != null)
+                            {
+                                carItem.Title = content.Title;
+                                carItem.Caption = content.Caption;
+                                carItem.ContentId = content._id;
+                            }
+                            if (carItem.Buttons != null)
+                                foreach (var carBtn in carItem.Buttons)
+                                {
+                                    var carBtnContent = contents.GetFor(carBtn);
+                                    carBtn.Text = carBtnContent?.ButtonText;
+                                    carBtn.ContentId = carBtnContent?._id;
+                                }
+                        }
+                    break;
+            }
+        }
+
+        public static SectionContent GetFor(this IEnumerable<BaseContent> contentCollection, Section section)
+        {
+            if (string.IsNullOrWhiteSpace(section._id)) return null;
+            return contentCollection.FirstOrDefault(x => x is SectionContent && !string.IsNullOrWhiteSpace((x as SectionContent).SectionId) && (x as SectionContent).SectionId == section._id) as SectionContent;
+        }
+        public static CarouselItemContent GetFor(this IEnumerable<BaseContent> contentCollection, CarouselItem carouselItem)
+        {
+            if (string.IsNullOrWhiteSpace(carouselItem._id)) return null;
+            return contentCollection.FirstOrDefault(x => x is CarouselItemContent && !string.IsNullOrWhiteSpace((x as CarouselItemContent).CarouselItemId) && (x as CarouselItemContent).CarouselItemId == carouselItem._id) as CarouselItemContent;
+        }
+        public static CarouselButtonContent GetFor(this IEnumerable<BaseContent> contentCollection, CarouselButton carouselBtn)
+        {
+            if (string.IsNullOrWhiteSpace(carouselBtn._id)) return null;
+            return contentCollection.FirstOrDefault(x => x is CarouselButtonContent && !string.IsNullOrWhiteSpace((x as CarouselButtonContent).CarouselButtonId) && (x as CarouselButtonContent).CarouselButtonId == carouselBtn._id) as CarouselButtonContent;
+        }
+        public static ButtonContent GetFor(this IEnumerable<BaseContent> contentCollection, Button btn)
+        {
+            return contentCollection.FirstOrDefault(x => x is ButtonContent && !string.IsNullOrWhiteSpace((x as ButtonContent).ButtonId) && (x as ButtonContent).ButtonId == btn._id) as ButtonContent;
+        }
+    }
+}
diff --git a/ANAConversationStudio/Helpers/MongoHelper.cs b/ANAConversationStudio/Helpers/MongoHelper.cs
deleted file mode 100644
index 6f746f5..0000000
--- a/ANAConversationStudio/Helpers/MongoHelper.cs
+++ /dev/null
@@ -1,200 +0,0 @@
-using MongoDB.Bson;
-using MongoDB.Bson.Serialization;
-using MongoDB.Bson.Serialization.Conventions;
-using MongoDB.Driver;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using ANAConversationStudio.Models;
-using ANAConversationStudio.Models.Chat;
-using ANAConversationStudio.Models.Chat.Sections;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Windows;
-
-namespace ANAConversationStudio.Helpers
-{
-    public class MongoHelper
-    {
-        public static MongoHelper Current { get; set; }
-
-        private DatabaseConnection _connection;
-        public MongoHelper(DatabaseConnection connection)
-        {
-            #region Init
-            ConventionRegistry.Register(typeof(IgnoreExtraElementsConvention).Name, new ConventionPack { new IgnoreExtraElementsConvention(true) }, t => true);
-            ConventionRegistry.Register("EnumStringConvention", new ConventionPack { new EnumRepresentationConvention(BsonType.String) }, t => true);
-            if (!BsonClassMap.IsClassMapRegistered(typeof(GifSection)))
-                BsonClassMap.RegisterClassMap<GifSection>();
-
-            if (!BsonClassMap.IsClassMapRegistered(typeof(TextSection)))
-                BsonClassMap.RegisterClassMap<TextSection>();
-
-            if (!BsonClassMap.IsClassMapRegistered(typeof(ImageSection)))
-                BsonClassMap.RegisterClassMap<ImageSection>();
-
-            if (!BsonClassMap.IsClassMapRegistered(typeof(AudioSection)))
-                BsonClassMap.RegisterClassMap<AudioSection>();
-
-            if (!BsonClassMap.IsClassMapRegistered(typeof(VideoSection)))
-                BsonClassMap.RegisterClassMap<VideoSection>();
-
-            if (!BsonClassMap.IsClassMapRegistered(typeof(EmbeddedHtmlSection)))
-                BsonClassMap.RegisterClassMap<EmbeddedHtmlSection>();
-
-            if (!BsonClassMap.IsClassMapRegistered(typeof(CarouselSection)))
-                BsonClassMap.RegisterClassMap<CarouselSection>();
-
-            if (!BsonClassMap.IsClassMapRegistered(typeof(NodeContent)))
-                BsonClassMap.RegisterClassMap<NodeContent>();
-
-            if (!BsonClassMap.IsClassMapRegistered(typeof(SectionContent)))
-                BsonClassMap.RegisterClassMap<SectionContent>();
-
-            if (!BsonClassMap.IsClassMapRegistered(typeof(TextSectionContent)))
-                BsonClassMap.RegisterClassMap<TextSectionContent>();
-
-            if (!BsonClassMap.IsClassMapRegistered(typeof(TitleCaptionSectionContent)))
-                BsonClassMap.RegisterClassMap<TitleCaptionSectionContent>();
-
-            if (!BsonClassMap.IsClassMapRegistered(typeof(ImageSectionContent)))
-                BsonClassMap.RegisterClassMap<ImageSectionContent>();
-
-            if (!BsonClassMap.IsClassMapRegistered(typeof(GraphSectionContent)))
-                BsonClassMap.RegisterClassMap<GraphSectionContent>();
-
-            if (!BsonClassMap.IsClassMapRegistered(typeof(ButtonContent)))
-                BsonClassMap.RegisterClassMap<ButtonContent>();
-
-            if (!BsonClassMap.IsClassMapRegistered(typeof(PrintOTPSection)))
-                BsonClassMap.RegisterClassMap<PrintOTPSection>();
-
-            if (!BsonClassMap.IsClassMapRegistered(typeof(CarouselButtonContent)))
-                BsonClassMap.RegisterClassMap<CarouselButtonContent>();
-
-            if (!BsonClassMap.IsClassMapRegistered(typeof(CarouselItemContent)))
-                BsonClassMap.RegisterClassMap<CarouselItemContent>();
-            #endregion
-            _connection = connection;
-        }
-
-        private MongoClient _chatDBClient;
-        public MongoClient ChatDBClient
-        {
-            get
-            {
-                if (_chatDBClient == null)
-                    _chatDBClient = new MongoClient(_connection.ConnectionString);
-                return _chatDBClient;
-            }
-        }
-
-        private IMongoDatabase _chatDB;
-        public IMongoDatabase ChatDB
-        {
-            get
-            {
-                if (_chatDB == null)
-                    _chatDB = ChatDBClient.GetDatabase(_connection.DatabaseName);
-                return _chatDB;
-            }
-        }
-
-        private List<ChatNode> _chatNodes;
-        public List<ChatNode> ChatNodes
-        {
-            get
-            {
-                if (_chatNodes == null)
-                {
-                    _chatNodes = ChatDB.GetCollection<ChatNode>(_connection.TemplateCollectionName).Find(new BsonDocument()).ToList();
-                    if (_chatNodes == null)
-                        _chatNodes = new List<ChatNode>();
-                }
-                return _chatNodes;
-            }
-        }
-
-        private List<BaseContent> _contents;
-        public List<BaseContent> Contents
-        {
-            get
-            {
-                if (_contents == null)
-                {
-                    _contents = ChatDB.GetCollection<BaseContent>(_connection.ContentCollectionName).Find(new BsonDocument()).ToList();
-                    if (_contents == null)
-                        _contents = new List<BaseContent>();
-                }
-                return _contents;
-            }
-        }
-
-        private Dictionary<string, Point> _NodeLocations;
-        public Dictionary<string, Point> NodeLocations
-        {
-            get
-            {
-                if (_NodeLocations == null)
-                {
-                    //Can be improved
-                    var layout = ChatDB.GetCollection<Dictionary<string, LayoutPoint>>(_connection.LayoutCollectionName).Find(new BsonDocument()).Project<Dictionary<string, LayoutPoint>>(Builders<Dictionary<string, LayoutPoint>>.Projection.Exclude("_id")).FirstOrDefault();
-                    _NodeLocations = layout.ToDictionary(x => x.Key, x => new Point(x.Value.X, x.Value.Y));
-                    if (_NodeLocations == null)
-                        _NodeLocations = new Dictionary<string, Point>();
-                }
-                return _NodeLocations;
-            }
-        }
-
-        public Point? GetPointForNode(string chatNodeId)
-        {
-            if (NodeLocations.ContainsKey(chatNodeId))
-                return NodeLocations[chatNodeId];
-            return null;
-        }
-
-        public void SaveNodeLocations(Dictionary<string, Point> nodeLocations)
-        {
-            if (nodeLocations.Count > 0)
-            {
-                var coll = ChatDB.GetCollection<Dictionary<string, LayoutPoint>>(_connection.LayoutCollectionName);
-                coll.DeleteMany(new BsonDocument()); //Clear All
-                coll.InsertOne(nodeLocations.ToDictionary(x => x.Key, x => new LayoutPoint { X = x.Value.X, Y = x.Value.Y }));
-            }
-        }
-
-        public void SaveChatNodes(List<ChatNode> nodes)
-        {
-            if (nodes.Count > 0)
-            {
-                var coll = ChatDB.GetCollection<ChatNode>(_connection.TemplateCollectionName);
-                coll.DeleteMany(new BsonDocument()); //Clear All
-                coll.InsertMany(nodes);
-                try
-                {
-                    if (!Directory.Exists("backup"))
-                        Directory.CreateDirectory("backup");
-                    File.WriteAllText("backup/nodes-" + ObjectId.GenerateNewId().ToString() + ".json", JsonConvert.SerializeObject(nodes, new StringEnumConverter()));
-                }
-                catch { }
-            }
-        }
-        public void SaveChatContent()
-        {
-            if (Contents.Count > 0)
-            {
-                var coll = ChatDB.GetCollection<BaseContent>(_connection.ContentCollectionName);
-                coll.DeleteMany(new BsonDocument()); //Clear All
-                coll.InsertMany(Contents);
-                try
-                {
-                    if (!Directory.Exists("backup"))
-                        Directory.CreateDirectory("backup");
-                    File.WriteAllText("backup/nodes-content-" + ObjectId.GenerateNewId().ToString() + ".json", JsonConvert.SerializeObject(Contents, new StringEnumConverter()));
-                }
-                catch { }
-            }
-        }
-    }
-}
diff --git a/ANAConversationStudio/Helpers/Settings.cs b/ANAConversationStudio/Helpers/Settings.cs
index 52879a5..6018f64 100644
--- a/ANAConversationStudio/Helpers/Settings.cs
+++ b/ANAConversationStudio/Helpers/Settings.cs
@@ -1,8 +1,8 @@
-using ANAConversationStudio.Models;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
 using System.IO;
+using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
 
 namespace ANAConversationStudio.Helpers
 {
@@ -10,7 +10,7 @@ public class Settings
     {
         const string FILE_NAME = "Settings.json";
 
-        public List<DatabaseConnection> SavedConnections { get; set; } = new List<DatabaseConnection>();
+        public List<ChatServerConnection> SavedChatServerConnections { get; set; } = new List<ChatServerConnection>();
         public EditableSettings UpdateDetails { get; set; } = new EditableSettings();
         public static bool IsEncrypted()
         {
@@ -40,26 +40,30 @@ public void Save(string password)
         }
     }
 
-    public class DatabaseConnection
+    public class ChatServerConnection
     {
-        public string TemplateCollectionName { get; set; }
-        public string ContentCollectionName { get; set; }
-        public string LayoutCollectionName { get; set; }
-
-        public string DatabaseName { get; set; }
-        public string ConnectionString { get; set; }
+        [PropertyOrder(1)]
         public string Name { get; set; }
+        [PropertyOrder(2)]
+        public string ServerUrl { get; set; }
+        
+        [PropertyOrder(3)]
+        public string APIKey { get; set; }
+        [PropertyOrder(4)]
+        public string APISecret { get; set; }
 
         public override string ToString()
         {
-            if (string.IsNullOrWhiteSpace(Name))
-                return "Unnamed Connection";
-            return Name;
+            if (!string.IsNullOrWhiteSpace(Name))
+                return Name;
+            if (!string.IsNullOrWhiteSpace(ServerUrl))
+                return ServerUrl;
+            return "New Chat Server Connection";
         }
 
         public bool IsValid()
         {
-            return Utilities.ValidateStrings(TemplateCollectionName, ContentCollectionName, LayoutCollectionName, DatabaseName, ConnectionString, Name);
+            return Utilities.ValidateStrings(ServerUrl, Name);
         }
     }
 
diff --git a/ANAConversationStudio/Helpers/Shortcuts.cs b/ANAConversationStudio/Helpers/Shortcuts.cs
index 4366d32..02b4f4b 100644
--- a/ANAConversationStudio/Helpers/Shortcuts.cs
+++ b/ANAConversationStudio/Helpers/Shortcuts.cs
@@ -1,13 +1,10 @@
 using MongoDB.Bson;
 using ANAConversationStudio.Models;
-using ANAConversationStudio.Models.Chat;
 using ANAConversationStudio.ViewModels;
 using ANAConversationStudio.Views;
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows;
 
 namespace ANAConversationStudio.Helpers
@@ -17,8 +14,9 @@ public static class Shortcuts
         public static void CloneNode(NodeViewModel node)
         {
             if (node == null) return;
+
             var copyChatNode = node.ChatNode.DeepCopy();
-            var contentBankOfNode = MongoHelper.Current.Contents.Where(x => x.NodeId == copyChatNode.Id).ToList().DeepCopy();
+            var contentBankOfNode = StudioContext.Current.ChatFlow.ChatContent.Where(x => x.NodeId == copyChatNode.Id).ToList().DeepCopy();
 
             var nodeContents = contentBankOfNode.Where(x => x is NodeContent).ToList();
             List<BaseContent> btnContents = null;
@@ -55,9 +53,8 @@ public static void CloneNode(NodeViewModel node)
                     foreach (var sectionContent in sectionContents.Where(x => x is SectionContent && (x as SectionContent).SectionId == oldSectionId))
                         (sectionContent as SectionContent).SectionId = section._id;
             }
-
-            MongoHelper.Current.Contents.AddRange(contentBankOfNode);
-            MainWindow.Current.ViewModel.CreateNode(copyChatNode, new Point(node.X + 100, node.Y + 100));
+            if (MainWindow.Current != null)
+                MainWindow.Current.ViewModel.CreateNode(copyChatNode, new Point(node.X + 100, node.Y + 100));
         }
     }
 }
\ No newline at end of file
diff --git a/ANAConversationStudio/Helpers/StudioContext.cs b/ANAConversationStudio/Helpers/StudioContext.cs
new file mode 100644
index 0000000..6c88c0f
--- /dev/null
+++ b/ANAConversationStudio/Helpers/StudioContext.cs
@@ -0,0 +1,211 @@
+using ANAConversationStudio.Models.Chat;
+using MongoDB.Bson;
+using MongoDB.Bson.Serialization;
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Net;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+
+namespace ANAConversationStudio.Helpers
+{
+    public class StudioContext
+    {
+        public static StudioContext Current { get; set; }
+        private StudioContext(ChatServerConnection conn) { ChatServer = conn; }
+
+        public static async Task<bool> LoadFromChatServerConnectionAsync(ChatServerConnection conn)
+        {
+            var s = new StudioContext(conn);
+            var done = await s.LoadProjectsAsync();
+            if (done)
+                Current = s;
+            return done;
+        }
+        public ChatServerConnection ChatServer { get; set; }
+        public List<ANAProject> ChatFlowProjects { get; set; }
+        public ChatFlowPack ChatFlow { get; set; }
+
+        private async Task<bool> LoadProjectsAsync()
+        {
+            var projsResp = await Hit<DataListResponse<ANAProject>>(LoadProjectsAPI);
+            if (projsResp.Status)
+            {
+                ChatFlowProjects = projsResp.Data;
+                try
+                {
+                    if (ChatFlowProjects == null || ChatFlowProjects.Count <= 0)
+                    {
+                        ChatFlowProjects = new List<ANAProject> { new ANAProject { Name = "My First ANA Project", _id = ObjectId.GenerateNewId().ToString() } };
+                        await SaveProjectsAsync();
+                    }
+                }
+                catch { }
+                return true;
+            }
+            MessageBox.Show("Error: " + projsResp.Message, "Unable to load projects from chat server.");
+            return false;
+        }
+
+        public async Task<bool> LoadChatFlowAsync(string projectId)
+        {
+            if (ChatFlowProjects != null && ChatFlowProjects.Any(x => x._id == projectId))
+            {
+                var chatFlowResp = await Hit<DataResponse<ChatFlowPack>>(FetchChatFlowPackAPI.Replace("{projectId}", projectId), true);
+                if (chatFlowResp.Status)
+                {
+                    ChatFlow = chatFlowResp.Data;
+                    ChatFlowBuilder.Build(ChatFlow);
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        public async Task<bool> SaveChatFlowAsync()
+        {
+            if (ChatFlow != null)
+            {
+                var saveChatFlowResp = await HitPost<DataResponse<ChatFlowPack>, ChatFlowPack>(SaveChatFlowPackAPI, ChatFlow, true);
+                if (saveChatFlowResp.Status)
+                {
+                    ChatFlow = saveChatFlowResp.Data;
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        public async Task<bool> SaveProjectsAsync()
+        {
+            if (ChatFlowProjects != null)
+            {
+                var saveProjectsResp = await HitPost<DataListResponse<ANAProject>, List<ANAProject>>(SaveProjectsAPI, ChatFlowProjects);
+                if (saveProjectsResp.Status)
+                {
+                    ChatFlowProjects = saveProjectsResp.Data;
+                    return true;
+                }
+            }
+            return false;
+        }
+
+
+        private const string LoadProjectsAPI = "api/Project/List";
+        private const string SaveProjectsAPI = "api/Project/Save";
+
+        private const string SaveChatFlowPackAPI = "api/Conversation/SaveChatFlow";
+        private const string FetchChatFlowPackAPI = "api/Conversation/FetchChatFlow?projectId={projectId}";
+
+        private async Task<T> Hit<T>(string api, bool strictTypeNames = false) where T : APIResponse
+        {
+            try
+            {
+                if (api == null) return null;
+
+                api = ChatServer.ServerUrl?.TrimEnd('/') + "/" + api;
+                using (var wc = new WebClient())
+                {
+                    wc.Headers[HttpRequestHeader.Authorization] = "Basic " + Convert.ToBase64String(Encoding.UTF8.GetBytes($"{ChatServer.APIKey}:{ChatServer.APISecret}"));
+                    T resp = default(T);
+                    if (strictTypeNames)
+                        resp = BsonSerializer.Deserialize<T>(await wc.DownloadStringTaskAsync(api));
+                    else
+                    {
+                        wc.Headers[HttpRequestHeader.Accept] = "application/json";
+                        resp = JsonConvert.DeserializeObject<T>(await wc.DownloadStringTaskAsync(api));
+                    }
+                    resp.Status = true;
+                    return resp;
+                }
+            }
+            catch (WebException ex)
+            {
+                using (var resp = new StreamReader(ex.Response.GetResponseStream()))
+                {
+                    var respParsed = JsonConvert.DeserializeObject<T>(await resp.ReadToEndAsync());
+                    if (respParsed == default(T))
+                    {
+                        respParsed = Activator.CreateInstance<T>();
+                        respParsed.Message = ex.Message;
+                    }
+                    respParsed.Status = false;
+                    return respParsed;
+                }
+            }
+            catch (Exception ex)
+            {
+                var respParsed = Activator.CreateInstance<T>();
+                respParsed.Message = ex.Message;
+                respParsed.Status = false;
+                return respParsed;
+            }
+        }
+        private async Task<T> HitPost<T, TReq>(string api, TReq requestData, bool strictTypeNames = false) where T : APIResponse
+        {
+            try
+            {
+                if (api == null) return null;
+
+                api = ChatServer.ServerUrl?.TrimEnd('/') + "/" + api;
+                using (var wc = new WebClient())
+                {
+                    wc.Headers[HttpRequestHeader.Authorization] = "Basic " + Convert.ToBase64String(Encoding.UTF8.GetBytes($"{ChatServer.APIKey}:{ChatServer.APISecret}"));
+                    T resp = default(T);
+                    if (strictTypeNames)
+                    {
+                        resp = BsonSerializer.Deserialize<T>(await wc.UploadStringTaskAsync(api, requestData.ToJson()));
+                    }
+                    else
+                    {
+                        wc.Headers[HttpRequestHeader.ContentType] = "application/json";
+                        wc.Headers[HttpRequestHeader.Accept] = "application/json";
+                        resp = JsonConvert.DeserializeObject<T>(await wc.UploadStringTaskAsync(api, JsonConvert.SerializeObject(requestData)));
+                    }
+                    resp.Status = true;
+                    return resp;
+                }
+            }
+            catch (WebException ex)
+            {
+                using (var resp = new StreamReader(ex.Response.GetResponseStream()))
+                {
+                    T respParsed = Activator.CreateInstance<T>();
+                    if (strictTypeNames)
+                        respParsed.Message = await resp.ReadToEndAsync();
+                    else
+                        respParsed = JsonConvert.DeserializeObject<T>(await resp.ReadToEndAsync());
+                    respParsed.Status = false;
+                    return respParsed;
+                }
+            }
+            catch (Exception ex)
+            {
+                T respParsed = Activator.CreateInstance<T>();
+                respParsed.Status = false;
+                respParsed.Message = ex.Message;
+                return respParsed;
+            }
+        }
+    }
+
+    public class APIResponse
+    {
+        public bool Status { get; set; }
+        public string Message { get; set; }
+    }
+
+    public class DataListResponse<T> : APIResponse
+    {
+        public List<T> Data { get; set; }
+    }
+
+    public class DataResponse<T> : APIResponse
+    {
+        public T Data { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/ANAConversationStudio/Helpers/Utilities.cs b/ANAConversationStudio/Helpers/Utilities.cs
index 1cd4636..30f467e 100644
--- a/ANAConversationStudio/Helpers/Utilities.cs
+++ b/ANAConversationStudio/Helpers/Utilities.cs
@@ -1,12 +1,10 @@
 using MongoDB.Bson;
 using MongoDB.Bson.Serialization;
-using MongoDB.Driver;
 using ANAConversationStudio.Models;
 using ANAConversationStudio.Models.Chat;
 using ANAConversationStudio.Models.Chat.Sections;
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Windows;
 using System.ComponentModel;
 using Serilog;
@@ -15,92 +13,15 @@
 using System.Net;
 using System.Threading.Tasks;
 using Newtonsoft.Json;
-using System.Reflection;
 using System.Security.Cryptography;
 using System.Text;
+using Newtonsoft.Json.Converters;
 
 namespace ANAConversationStudio.Helpers
 {
     public static class Utilities
     {
         public static Settings Settings { get; set; }
-        
-        public static BaseContent GetContentObject(object contentOwner)
-        {
-            BaseContent contentObj = null;
-            if (contentOwner is TextSection)
-                contentObj = new TextSectionContent();
-            else if (contentOwner is ImageSection)
-                contentObj = new ImageSectionContent();
-            else if (contentOwner is AudioSection || contentOwner is VideoSection || contentOwner is EmbeddedHtmlSection || contentOwner is GifSection)
-                contentObj = new TitleCaptionSectionContent();
-            else if (contentOwner is ChatNode)
-                contentObj = new NodeContent();
-            else if (contentOwner is Button)
-                contentObj = new ButtonContent();
-            return contentObj;
-        }
-        public static IEnumerable<BaseContent> GetContentBank(object choosenOwner)
-        {
-            if (choosenOwner is ChatNode node)
-                return MongoHelper.Current.Contents.Where(x => x is NodeContent).Cast<NodeContent>().Where(x => x.NodeId == node.Id).ToList();
-
-            if (choosenOwner is Section section)
-                return MongoHelper.Current.Contents.Where(x => x is SectionContent).Cast<SectionContent>().Where(x => x.SectionId == section._id).ToList();
-
-            if (choosenOwner is Button btn)
-                return MongoHelper.Current.Contents.Where(x => x is ButtonContent).Cast<ButtonContent>().Where(x => x.ButtonId == btn._id).ToList();
-
-            if (choosenOwner is CarouselItem cItem)
-                return MongoHelper.Current.Contents.Where(x => x is CarouselItemContent).Cast<CarouselItemContent>().Where(x => x.CarouselItemId == cItem._id).ToList();
-
-            if (choosenOwner is CarouselButton cButton)
-                return MongoHelper.Current.Contents.Where(x => x is CarouselButtonContent).Cast<CarouselButtonContent>().Where(x => x.CarouselButtonId == cButton._id).ToList();
-
-            return new List<BaseContent>();
-        }
-        public static void UpdateContentBank(IEnumerable<BaseContent> editedContentEntries)
-        {
-            if (editedContentEntries != null && editedContentEntries.Count() > 0)
-            {
-                MongoHelper.Current.Contents.RemoveAll(x => editedContentEntries.Select(y => y._id).Contains(x._id));
-                MongoHelper.Current.Contents.AddRange(editedContentEntries);
-            }
-        }
-        public static BaseContent GetContentObjectV2(object contentOwner)
-        {
-            BaseContent contentObj = null;
-            if (contentOwner is Section sec)
-            {
-                switch (sec.SectionType)
-                {
-                    case SectionTypeEnum.Image:
-                        contentObj = new ImageSectionContent();
-                        break;
-                    case SectionTypeEnum.Text:
-                        contentObj = new TextSectionContent();
-                        break;
-                    default:
-                        contentObj = new TitleCaptionSectionContent();
-                        break;
-                }
-            }
-            else if (contentOwner is ChatNode)
-                contentObj = new NodeContent();
-            else if (contentOwner is Button)
-                contentObj = new ButtonContent();
-            else if (contentOwner is CarouselItem)
-                contentObj = new CarouselItemContent();
-            else if (contentOwner is CarouselButton)
-                contentObj = new CarouselButtonContent();
-            return contentObj;
-        }
-
-        static Random rand = new Random();
-        public static int Rand()
-        {
-            return rand.Next(700, 1000);
-        }
 
         public static bool IsDesignMode()
         {
@@ -170,6 +91,144 @@ public static string Decrypt(string cipherText, string encryptionKey)
             return cipherText;
         }
 
+        public static readonly JsonSerializerSettings StrictTypeHandlingJsonSettings = new JsonSerializerSettings
+        {
+            TypeNameHandling = TypeNameHandling.All,
+            Converters = new List<JsonConverter> { new StringEnumConverter() }
+        };
+
+        public static List<BaseContent> ExtractContentFromChatNodes(List<ChatNode> chatNodes)
+        {
+            var contentBank = new List<BaseContent>();
+            foreach (var node in chatNodes)
+            {
+                if (node.Buttons != null)
+                    foreach (var btn in node.Buttons)
+                    {
+                        contentBank.Add(new ButtonContent
+                        {
+                            ButtonId = btn._id,
+                            ButtonText = btn.ButtonText,
+                            NodeId = node.Id,
+                            _id = btn.ContentId,
+                            Emotion = btn.ContentEmotion,
+                            CreatedOn = DateTime.Now,
+                            UpdatedOn = DateTime.Now
+                        });
+                    }
+
+                if (node.Sections != null)
+                    foreach (var section in node.Sections)
+                    {
+                        switch (section.SectionType)
+                        {
+                            case SectionTypeEnum.Image:
+                            case SectionTypeEnum.Gif:
+                            case SectionTypeEnum.Audio:
+                            case SectionTypeEnum.Video:
+                            case SectionTypeEnum.EmbeddedHtml:
+                                {
+                                    var titleCaptionSection = section as TitleCaptionSection;
+                                    contentBank.Add(new TitleCaptionSectionContent
+                                    {
+                                        Caption = titleCaptionSection.Caption,
+                                        Title = titleCaptionSection.Title,
+                                        _id = titleCaptionSection.ContentId,
+                                        SectionId = titleCaptionSection._id,
+                                        NodeId = node.Id,
+                                        CreatedOn = DateTime.Now,
+                                        UpdatedOn = DateTime.Now,
+                                        Emotion = titleCaptionSection.ContentEmotion
+                                    });
+                                }
+                                break;
+                            case SectionTypeEnum.Text:
+                                {
+                                    var ts = section as TextSection;
+                                    contentBank.Add(new TextSectionContent
+                                    {
+                                        CreatedOn = DateTime.Now,
+                                        UpdatedOn = DateTime.Now,
+                                        Emotion = ts.ContentEmotion,
+                                        NodeId = node.Id,
+                                        SectionId = ts._id,
+                                        SectionText = ts.Text,
+                                        _id = ts.ContentId
+                                    });
+                                }
+                                break;
+                            case SectionTypeEnum.Graph:
+                                break;
+                            case SectionTypeEnum.Link:
+                                break;
+                            case SectionTypeEnum.Carousel:
+                                {
+                                    var car = section as CarouselSection;
+                                    contentBank.Add(new TitleCaptionSectionContent
+                                    {
+                                        _id = car.ContentId,
+                                        Caption = car.Caption,
+                                        Title = car.Title,
+                                        Emotion = car.ContentEmotion,
+                                        NodeId = node.Id,
+                                        SectionId = car._id,
+                                        CreatedOn = DateTime.Now,
+                                        UpdatedOn = DateTime.Now
+                                    });
+
+                                    foreach (var carItem in car.Items)
+                                    {
+                                        contentBank.Add(new CarouselItemContent
+                                        {
+                                            Caption = carItem.Caption,
+                                            CarouselItemId = carItem._id,
+                                            _id = carItem.ContentId,
+                                            Emotion = car.ContentEmotion,
+                                            NodeId = node.Id,
+                                            Title = carItem.Title,
+                                            CreatedOn = DateTime.Now,
+                                            UpdatedOn = DateTime.Now
+                                        });
+
+                                        foreach (var carItemButton in carItem.Buttons)
+                                        {
+                                            contentBank.Add(new CarouselButtonContent
+                                            {
+                                                _id = carItemButton.ContentId,
+                                                ButtonText = carItemButton.Text,
+                                                CarouselButtonId = carItemButton._id,
+                                                CreatedOn = DateTime.Now,
+                                                UpdatedOn = DateTime.Now,
+                                                Emotion = car.ContentEmotion,
+                                                NodeId = node.Id
+                                            });
+                                        }
+                                    }
+                                }
+                                break;
+                            case SectionTypeEnum.PrintOTP:
+                                break;
+                            default:
+                                break;
+                        }
+                    }
+
+            }
+            return contentBank;
+        }
+
+        public static string TrimText(string text, int length = Constants.GroupHeaderTextMaxLength, bool removeNewLines = true)
+        {
+            if (text == null) return null;
+
+            if (removeNewLines)
+                text = text.Replace("\r\n", " ");
+
+            bool trimNeeded = text.Length > Constants.GroupHeaderTextMaxLength;
+            if (trimNeeded)
+                text = text.Substring(0, Constants.GroupHeaderTextMaxLength) + "...";
+            return text;
+        }
     }
 
     public static class Exts
@@ -179,6 +238,13 @@ public static T DeepCopy<T>(this T source)
             var json = source.ToJson();
             return BsonSerializer.Deserialize<T>(json);
         }
+
+        public static Point? GetPointForNode(this Dictionary<string, LayoutPoint> nodeLocations, string chatNodeId)
+        {
+            if (nodeLocations.ContainsKey(chatNodeId) && nodeLocations[chatNodeId] != null)
+                return new Point(nodeLocations[chatNodeId].X, nodeLocations[chatNodeId].Y);
+            return null;
+        }
     }
     public static class Logger
     {
@@ -198,7 +264,6 @@ public static void Write(string message)
     }
     public static class Constants
     {
-        //TODO: Implement Window Layout save and restore function.
-        public const string WindowLayoutFileName = "WindowLayout.xml";
+        public const int GroupHeaderTextMaxLength = 50;
     }
 }
diff --git a/ANAConversationStudio/Models/Chat/ANAProject.cs b/ANAConversationStudio/Models/Chat/ANAProject.cs
new file mode 100644
index 0000000..21647ca
--- /dev/null
+++ b/ANAConversationStudio/Models/Chat/ANAProject.cs
@@ -0,0 +1,19 @@
+using ANAConversationStudio.Helpers;
+
+namespace ANAConversationStudio.Models.Chat
+{
+    public class ANAProject : BaseIdEntity
+    {
+        public string Name { get; set; }
+
+        public override string ToString()
+        {
+            return Name;
+        }
+
+        public bool IsValid()
+        {
+            return Utilities.ValidateStrings(Name);
+        }
+    }
+}
diff --git a/ANAConversationStudio/Models/Chat/BaseContent.cs b/ANAConversationStudio/Models/Chat/BaseContent.cs
index 2c9d96c..44f5972 100644
--- a/ANAConversationStudio/Models/Chat/BaseContent.cs
+++ b/ANAConversationStudio/Models/Chat/BaseContent.cs
@@ -29,7 +29,6 @@ public string NodeName
         }
 
         private string _NodeId;
-        [Editor(typeof(ReadonlyTextBoxEditor), typeof(ReadonlyTextBoxEditor))]
         public string NodeId
         {
             get { return _NodeId; }
@@ -77,7 +76,6 @@ public string NodeHeaderText
     public class SectionContent : BaseContent
     {
         private string _SectionId;
-        [Editor(typeof(ReadonlyTextBoxEditor), typeof(ReadonlyTextBoxEditor))]
         public string SectionId
         {
             get { return _SectionId; }
@@ -142,22 +140,6 @@ public string Caption
             }
         }
     }
-    public class ImageSectionContent : TitleCaptionSectionContent
-    {
-        private string _AltText;
-        public string AltText
-        {
-            get { return _AltText; }
-            set
-            {
-                if (_AltText != value)
-                {
-                    _AltText = value;
-                    OnPropertyChanged();
-                }
-            }
-        }
-    }
     public class GraphSectionContent : SectionContent
     {
         private string _XLabel;
@@ -233,7 +215,6 @@ public string CoordinateText
     public class ButtonContent : BaseContent
     {
         private string _ButtonId;
-        [Editor(typeof(ReadonlyTextBoxEditor), typeof(ReadonlyTextBoxEditor))]
         public string ButtonId
         {
             get { return _ButtonId; }
@@ -266,7 +247,6 @@ public string ButtonText
     public class CarouselButtonContent : BaseContent
     {
         private string _CarouselButtonId;
-        [Editor(typeof(ReadonlyTextBoxEditor), typeof(ReadonlyTextBoxEditor))]
         public string CarouselButtonId
         {
             get { return _CarouselButtonId; }
@@ -299,7 +279,6 @@ public string ButtonText
     public class CarouselItemContent : BaseContent
     {
         private string _CarouselItemId;
-        [Editor(typeof(ReadonlyTextBoxEditor), typeof(ReadonlyTextBoxEditor))]
         public string CarouselItemId
         {
             get { return _CarouselItemId; }
diff --git a/ANAConversationStudio/Models/Chat/BaseEntity.cs b/ANAConversationStudio/Models/Chat/BaseEntity.cs
index fc36be9..98d454d 100644
--- a/ANAConversationStudio/Models/Chat/BaseEntity.cs
+++ b/ANAConversationStudio/Models/Chat/BaseEntity.cs
@@ -11,7 +11,8 @@ public class BaseIdEntity : INotifyPropertyChanged
         protected void OnPropertyChanged([CallerMemberName]string propertyName = null) => PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
 
         private string __id;
-        [Editor(typeof(ReadonlyTextBoxEditor), typeof(ReadonlyTextBoxEditor))]
+        [DisplayName("Id")]
+        [ReadOnly(true)]
         public string _id
         {
             get { return __id; }
@@ -28,7 +29,6 @@ public string _id
     public class BaseIdTimeStampEntity : BaseIdEntity
     {
         private DateTime _CreatedOn;
-        [Editor(typeof(ReadonlyTextBoxEditor), typeof(ReadonlyTextBoxEditor))]
         public DateTime CreatedOn
         {
             get { return _CreatedOn; }
@@ -43,7 +43,6 @@ public DateTime CreatedOn
         }
 
         private DateTime _UpdatedOn;
-        [Editor(typeof(ReadonlyTextBoxEditor), typeof(ReadonlyTextBoxEditor))]
         public DateTime UpdatedOn
         {
             get { return _UpdatedOn; }
@@ -80,4 +79,84 @@ public override string ToString()
         }
     }
 
+    public class RepeatableBaseEntity : BaseEntity
+    {
+        #region For Repeat Items
+
+        private bool _DoesRepeat;
+
+        public bool DoesRepeat
+        {
+            get { return _DoesRepeat; }
+            set
+            {
+                if (_DoesRepeat != value)
+                {
+                    _DoesRepeat = value;
+                    OnPropertyChanged();
+                }
+            }
+        }
+
+        private string _RepeatOn;
+
+        public string RepeatOn
+        {
+            get { return _RepeatOn; }
+            set
+            {
+                if (_RepeatOn != value)
+                {
+                    _RepeatOn = value;
+                    OnPropertyChanged();
+                }
+            }
+        }
+
+        private string _RepeatAs;
+
+        public string RepeatAs
+        {
+            get { return _RepeatAs; }
+            set
+            {
+                if (_RepeatAs != value)
+                {
+                    _RepeatAs = value;
+                    OnPropertyChanged();
+                }
+            }
+        }
+
+        private int _StartPosition;
+
+        public int StartPosition
+        {
+            get { return _StartPosition; }
+            set
+            {
+                if (_StartPosition != value)
+                {
+                    _StartPosition = value;
+                    OnPropertyChanged();
+                }
+            }
+        }
+
+        private int _MaxRepeats;
+
+        public int MaxRepeats
+        {
+            get { return _MaxRepeats; }
+            set
+            {
+                if (_MaxRepeats != value)
+                {
+                    _MaxRepeats = value;
+                    OnPropertyChanged();
+                }
+            }
+        }
+        #endregion
+    }
 }
\ No newline at end of file
diff --git a/ANAConversationStudio/Models/Chat/Button.cs b/ANAConversationStudio/Models/Chat/Button.cs
index a2d1c94..3d45650 100644
--- a/ANAConversationStudio/Models/Chat/Button.cs
+++ b/ANAConversationStudio/Models/Chat/Button.cs
@@ -1,15 +1,21 @@
-using ANAConversationStudio.Controls;
+using ANAConversationStudio.Helpers;
+using ANAConversationStudio.UIHelpers;
+using MongoDB.Bson.Serialization.Attributes;
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
 using System.ComponentModel;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
+using System.Linq;
+using System.Windows.Input;
 
 namespace ANAConversationStudio.Models.Chat
 {
-    [CategoryOrder("Important", 1)]
-    [CategoryOrder("For ButtonType Get[X]", 2)]
-    [CategoryOrder("Misc", 3)]
-    public class Button : BaseEntity
+    public class Button : RepeatableBaseEntity
     {
-        public Button() { }
+        public Button()
+        {
+            FillAlias();
+        }
 
         #region Important
         private ButtonTypeEnum _ButtonType = ButtonTypeEnum.NextNode;
@@ -22,6 +28,8 @@ public ButtonTypeEnum ButtonType
                 if (_ButtonType != value)
                 {
                     _ButtonType = value;
+
+                    FillAlias();
                     OnPropertyChanged();
                 }
             }
@@ -212,7 +220,6 @@ public bool Hidden
         }
 
         private string _NextNodeId;
-        //[Editor(typeof(ReadonlyTextBoxEditor), typeof(ReadonlyTextBoxEditor))]
         public string NextNodeId
         {
             get { return _NextNodeId; }
@@ -227,6 +234,82 @@ public string NextNodeId
         }
         #endregion
 
+        //Content
+        private string _ButtonText;
+        [JsonIgnore]
+        [BsonIgnore]
+        public string ButtonText
+        {
+            get { return _ButtonText; }
+            set
+            {
+                if (_ButtonText != value)
+                {
+                    _ButtonText = value;
+
+                    FillAlias();
+                    OnPropertyChanged();
+                }
+            }
+        }
+
+        [JsonIgnore]
+        [BsonIgnore]
+        public IEnumerable<ButtonTypeEnum> ButtonTypes => Enum.GetValues(typeof(ButtonTypeEnum)).Cast<ButtonTypeEnum>();
+
+        private ChatNode _ParentNode;
+        [JsonIgnore]
+        [BsonIgnore]
+        public ChatNode ParentNode
+        {
+            get { return _ParentNode; }
+            set
+            {
+                if (_ParentNode != value)
+                {
+                    _ParentNode = value;
+                    OnPropertyChanged();
+                }
+            }
+        }
+
+        [JsonIgnore]
+        [BsonIgnore]
+        public ICommand Remove => new ActionCommand((p) => ParentNode.Buttons.Remove(this));
+
+        [JsonIgnore]
+        [BsonIgnore]
+        public ICommand MoveUp => new ActionCommand((p) =>
+        {
+            var oldIdx = ParentNode.Buttons.IndexOf(this);
+            if (oldIdx <= 0) return;
+
+            ParentNode.Buttons.Move(oldIdx, oldIdx - 1);
+        });
+
+        [JsonIgnore]
+        [BsonIgnore]
+        public ICommand MoveDown => new ActionCommand((p) =>
+        {
+            var oldIdx = ParentNode.Buttons.IndexOf(this);
+            if (oldIdx >= ParentNode.Buttons.Count - 1) return;
+
+            ParentNode.Buttons.Move(oldIdx, oldIdx + 1);
+        });
+
+        [JsonIgnore]
+        [BsonIgnore]
+        public string ContentId { get; set; }
+
+        [JsonIgnore]
+        [BsonIgnore]
+        public string ContentEmotion { get; set; }
+
+        private void FillAlias()
+        {
+            Alias = Utilities.TrimText(string.IsNullOrWhiteSpace(ButtonText) ? ButtonType + "" : ButtonText);
+        }
+
         public override string ToString()
         {
             return Alias;
diff --git a/ANAConversationStudio/Models/Chat/ChatFlowPack.cs b/ANAConversationStudio/Models/Chat/ChatFlowPack.cs
new file mode 100644
index 0000000..b48cdc8
--- /dev/null
+++ b/ANAConversationStudio/Models/Chat/ChatFlowPack.cs
@@ -0,0 +1,13 @@
+using System.Collections.Generic;
+
+namespace ANAConversationStudio.Models.Chat
+{
+    public class ChatFlowPack : BaseIdTimeStampEntity
+    {
+        public string ProjectId { get; set; }
+
+        public List<ChatNode> ChatNodes { get; set; }
+        public List<BaseContent> ChatContent { get; set; }
+        public Dictionary<string, LayoutPoint> NodeLocations { get; set; }
+    }
+}
diff --git a/ANAConversationStudio/Models/Chat/ChatNode.cs b/ANAConversationStudio/Models/Chat/ChatNode.cs
index 23f9d64..202bb87 100644
--- a/ANAConversationStudio/Models/Chat/ChatNode.cs
+++ b/ANAConversationStudio/Models/Chat/ChatNode.cs
@@ -1,31 +1,28 @@
 using MongoDB.Bson;
 using ANAConversationStudio.Models.Chat.Sections;
-using ANAConversationStudio.Controls;
 using System.Collections.ObjectModel;
 using System.ComponentModel;
 using System.Runtime.CompilerServices;
 using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
 using MongoDB.Bson.Serialization.Attributes;
-using Newtonsoft.Json.Converters;
 using Newtonsoft.Json;
+using System.Windows.Input;
+using ANAConversationStudio.UIHelpers;
+using System.Windows;
+using ANAConversationStudio.Helpers;
 
 namespace ANAConversationStudio.Models.Chat
 {
-    [CategoryOrder("Important", 1)]
-    [CategoryOrder("For NodeType ApiCall", 2)]
-    [CategoryOrder("For NodeType Card", 3)]
-    [CategoryOrder("Misc", 4)]
     public class ChatNode : INotifyPropertyChanged
     {
         public ChatNode()
         {
-            Buttons.CollectionChanged += ButtonsCollectionChanged;
+            FillAlias();
         }
 
         #region Important
         private string _Name;
         [Category("Important")]
-        [PropertyOrder(1)]
         public string Name
         {
             get { return _Name; }
@@ -34,6 +31,7 @@ public string Name
                 if (_Name != value)
                 {
                     _Name = value;
+                    FillAlias();
                     OnPropertyChanged();
                 }
             }
@@ -41,7 +39,6 @@ public string Name
 
         private NodeTypeEnum _NodeType = NodeTypeEnum.Combination;
         [Category("Important")]
-        [PropertyOrder(2)]
         public NodeTypeEnum NodeType
         {
             get { return _NodeType; }
@@ -50,16 +47,14 @@ public NodeTypeEnum NodeType
                 if (_NodeType != value)
                 {
                     _NodeType = value;
+                    FillAlias();
                     OnPropertyChanged();
                 }
             }
         }
 
         private ObservableCollection<Section> _Sections = new ObservableCollection<Section>();
-        [NewItemTypes(typeof(TextSection), typeof(GifSection), typeof(ImageSection), typeof(EmbeddedHtmlSection), typeof(GraphSection), typeof(AudioSection), typeof(VideoSection), typeof(CarouselSection), typeof(PrintOTPSection))]
         [Category("Important")]
-        [PropertyOrder(3)]
-        [Editor(typeof(ChatNodeCollectionEditor<Section>), typeof(ChatNodeCollectionEditor<Section>))]
         public ObservableCollection<Section> Sections
         {
             get { return _Sections; }
@@ -75,8 +70,6 @@ public ObservableCollection<Section> Sections
 
         private ObservableCollection<Button> _Buttons = new ObservableCollection<Button>();
         [Category("Important")]
-        [Editor(typeof(ChatNodeCollectionEditor<Button>), typeof(ChatNodeCollectionEditor<Button>))]
-        [PropertyOrder(4)]
         public ObservableCollection<Button> Buttons
         {
             get { return _Buttons; }
@@ -94,7 +87,6 @@ public ObservableCollection<Button> Buttons
         #region Misc
         private string _Id;
         [Category("Misc")]
-        [Editor(typeof(ReadonlyTextBoxEditor), typeof(ReadonlyTextBoxEditor))]
         public string Id
         {
             get { return _Id; }
@@ -215,6 +207,21 @@ public string ApiUrl
             }
         }
 
+        private string _ApiResponseDataRoot;
+        [Category("For NodeType ApiCall")]
+        public string ApiResponseDataRoot
+        {
+            get { return _ApiResponseDataRoot; }
+            set
+            {
+                if (_ApiResponseDataRoot != value)
+                {
+                    _ApiResponseDataRoot = value;
+                    OnPropertyChanged();
+                }
+            }
+        }
+
         private string _NextNodeId;
         [Category("For NodeType ApiCall")]
         public string NextNodeId
@@ -281,22 +288,161 @@ public Placement? Placement
         }
         #endregion
 
+        private string _Alias;
+        [JsonIgnore]
+        [BsonIgnore]
+        public string Alias
+        {
+            get { return _Alias; }
+            set
+            {
+                if (_Alias != value)
+                {
+                    _Alias = value;
+                    OnPropertyChanged();
+                }
+            }
+        }
+
+        [JsonIgnore]
+        [BsonIgnore]
+        public ICommand AddSection => new ActionCommand((param) =>
+        {
+            var type = (SectionTypeEnum)param;
+            switch (type)
+            {
+                case SectionTypeEnum.Image:
+                    Sections.Add(new ImageSection
+                    {
+                        Alias = "New Image",
+                        Caption = "Image Caption",
+                        Title = "Image Title",
+                        Url = "http://",
+                        _id = ObjectId.GenerateNewId().ToString(),
+                        ParentNode = this,
+                        ContentId = ObjectId.GenerateNewId().ToString(),
+                    });
+                    break;
+                case SectionTypeEnum.Text:
+                    Sections.Add(new TextSection
+                    {
+                        Alias = "New Text",
+                        Text = "Text Section",
+                        _id = ObjectId.GenerateNewId().ToString(),
+                        ParentNode = this,
+                        ContentId = ObjectId.GenerateNewId().ToString(),
+                    });
+                    break;
+                case SectionTypeEnum.Gif:
+                    Sections.Add(new GifSection
+                    {
+                        Alias = "New Gif",
+                        Caption = "Gif Caption",
+                        Title = "Gif Title",
+                        Url = "http://",
+                        _id = ObjectId.GenerateNewId().ToString(),
+                        ParentNode = this,
+                        ContentId = ObjectId.GenerateNewId().ToString(),
+                    });
+                    break;
+                case SectionTypeEnum.Audio:
+                    Sections.Add(new AudioSection
+                    {
+                        Alias = "New Audio",
+                        Caption = "Audio Caption",
+                        Title = "Audio Title",
+                        Url = "http://",
+                        _id = ObjectId.GenerateNewId().ToString(),
+                        ParentNode = this,
+                        ContentId = ObjectId.GenerateNewId().ToString(),
+                    });
+                    break;
+                case SectionTypeEnum.Video:
+                    Sections.Add(new VideoSection
+                    {
+                        Alias = "New Video",
+                        Caption = "Video Caption",
+                        Title = "Video Title",
+                        Url = "http://",
+                        _id = ObjectId.GenerateNewId().ToString(),
+                        ParentNode = this,
+                        ContentId = ObjectId.GenerateNewId().ToString(),
+                    });
+                    break;
+                case SectionTypeEnum.EmbeddedHtml:
+                    Sections.Add(new EmbeddedHtmlSection
+                    {
+                        Alias = "New Html",
+                        Caption = "HTML Caption",
+                        Title = "HTML Title",
+                        Url = "http://",
+                        _id = ObjectId.GenerateNewId().ToString(),
+                        ParentNode = this,
+                        ContentId = ObjectId.GenerateNewId().ToString(),
+                    });
+                    break;
+                case SectionTypeEnum.Carousel:
+                    {
+                        var carSec = new CarouselSection
+                        {
+                            _id = ObjectId.GenerateNewId().ToString(),
+                            Alias = "New Carousel",
+                            Title = "Carousel Title",
+                            Caption = "Carousel Caption",
+                            ParentNode = this,
+                            ContentId = ObjectId.GenerateNewId().ToString(),
+                        };
+                        var carItem = new CarouselItem
+                        {
+                            Title = "Carousel Item Title",
+                            Caption = "Carousel Item Caption",
+                            ImageUrl = "http://",
+                            ParentCarouselSection = carSec,
+                            _id = ObjectId.GenerateNewId().ToString(),
+                            ContentId = ObjectId.GenerateNewId().ToString(),
+                        };
+                        carItem.Buttons = new ObservableCollection<CarouselButton>
+                        {
+                            new CarouselButton
+                            {
+                                ContentId = ObjectId.GenerateNewId().ToString(),
+                                ParentCarouselItem = carItem,
+                                Text = "Carousel Button Text",
+                                _id = ObjectId.GenerateNewId().ToString(),
+                            }
+                        };
+                        carSec.Items = new ObservableCollection<CarouselItem> { carItem };
+                        Sections.Add(carSec);
+                    }
+                    break;
+                default:
+                    MessageBox.Show($"Section Type: '{type}' not yet supported!");
+                    break;
+            }
+        });
+
+        [JsonIgnore]
+        [BsonIgnore]
+        public ICommand AddButton => new ActionCommand((param) =>
+        {
+            Buttons.Add(new Button
+            {
+                ParentNode = this,
+                _id = ObjectId.GenerateNewId().ToString()
+            });
+        });
+
+        private void FillAlias()
+        {
+            Alias = Utilities.TrimText(string.IsNullOrWhiteSpace(Name) ? NodeType + "" : Name);
+        }
+
         public event PropertyChangedEventHandler PropertyChanged;
         private void OnPropertyChanged([CallerMemberName]string propertyName = null) => PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
         public override string ToString()
         {
             return Name;
         }
-
-        private void ButtonsCollectionChanged(object sender, System.Collections.Specialized.NotifyCollectionChangedEventArgs e)
-        {
-            if (e.NewItems != null)
-                foreach (Button item in e.NewItems)
-                {
-                    item._id = ObjectId.GenerateNewId().ToString();
-                    item.Alias = "New Button";
-                }
-        }
     }
 
     public enum ApiMethodEnum
diff --git a/ANAConversationStudio/Models/Chat/Sections/AudioSection.cs b/ANAConversationStudio/Models/Chat/Sections/AudioSection.cs
index 6eeb864..d3f7e92 100644
--- a/ANAConversationStudio/Models/Chat/Sections/AudioSection.cs
+++ b/ANAConversationStudio/Models/Chat/Sections/AudioSection.cs
@@ -2,21 +2,12 @@
 
 namespace ANAConversationStudio.Models.Chat.Sections
 {
-    public class AudioSection : Section
+    public class AudioSection : TitleCaptionUrlSection
     {
         public AudioSection()
         {
             SectionType = SectionTypeEnum.Audio;
         }
-
-        public int DurationInSeconds { get; set; }
-        public AudioFormatEnum Format { get; set; }
-        [Category("Important")]
-        public string Url { get; set; }
-        public string EncodingType { get; set; } = null;
-        public bool Downloadable { get; set; } = false;
-        public bool Buffer { get; set; } = false;
-        public bool AnimateEmotion { get; set; } = false;
     }
 
     public enum AudioFormatEnum
diff --git a/ANAConversationStudio/Models/Chat/Sections/CarouselSection.cs b/ANAConversationStudio/Models/Chat/Sections/CarouselSection.cs
index b4f589e..bec2c66 100644
--- a/ANAConversationStudio/Models/Chat/Sections/CarouselSection.cs
+++ b/ANAConversationStudio/Models/Chat/Sections/CarouselSection.cs
@@ -1,37 +1,241 @@
 using ANAConversationStudio.Controls;
+using ANAConversationStudio.Helpers;
+using ANAConversationStudio.UIHelpers;
 using MongoDB.Bson;
+using MongoDB.Bson.Serialization.Attributes;
+using Newtonsoft.Json;
+using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.ComponentModel;
 using System.Linq;
+using System.Windows.Input;
 
 namespace ANAConversationStudio.Models.Chat.Sections
 {
-    public class CarouselSection : Section
+    public class CarouselSection : TitleCaptionSection
     {
         public CarouselSection()
         {
             SectionType = SectionTypeEnum.Carousel;
         }
 
-        [Editor(typeof(ChatElementCollectionEditor<CarouselItem>), typeof(ChatElementCollectionEditor<CarouselItem>))]
-        public ObservableCollection<CarouselItem> Items { get; set; } = new ObservableCollection<CarouselItem>();
+
+        private ObservableCollection<CarouselItem> _Items = new ObservableCollection<CarouselItem>();
+        public ObservableCollection<CarouselItem> Items
+        {
+            get { return _Items; }
+            set
+            {
+                if (_Items != value)
+                {
+                    _Items = value;
+                    OnPropertyChanged();
+                }
+            }
+        }
+
+        [JsonIgnore]
+        [BsonIgnore]
+        public ICommand AddItem => new ActionCommand((p) => Items.Add(new CarouselItem
+        {
+            ContentId = ObjectId.GenerateNewId().ToString(),
+            ParentCarouselSection = this,
+            _id = ObjectId.GenerateNewId().ToString(),
+            Title = "New Carousel Item"
+        }));
     }
 
-    public class CarouselItem : BaseEntity
+    public class CarouselItem : RepeatableBaseEntity
     {
-        public string ImageUrl { get; set; }
+        private string _ImageUrl;
+        public string ImageUrl
+        {
+            get { return _ImageUrl; }
+            set
+            {
+                if (_ImageUrl != value)
+                {
+                    _ImageUrl = value;
+                    OnPropertyChanged();
+                }
+            }
+        }
+
+        private ObservableCollection<CarouselButton> _Buttons = new ObservableCollection<CarouselButton>();
+        public ObservableCollection<CarouselButton> Buttons
+        {
+            get { return _Buttons; }
+            set
+            {
+                if (_Buttons != value)
+                {
+                    _Buttons = value;
+                    OnPropertyChanged();
+                }
+            }
+        }
+
+        private string _Title;
+        [JsonIgnore]
+        [BsonIgnore]
+        public string Title
+        {
+            get { return _Title; }
+            set
+            {
+                if (_Title != value)
+                {
+                    _Title = value;
+                    OnPropertyChanged();
+                }
+            }
+        }
+
+        private string _Caption;
+        [JsonIgnore]
+        [BsonIgnore]
+        public string Caption
+        {
+            get { return _Caption; }
+            set
+            {
+                if (_Caption != value)
+                {
+                    _Caption = value;
+                    OnPropertyChanged();
+                }
+            }
+        }
+
+        [JsonIgnore]
+        [BsonIgnore]
+        public string ContentId { get; set; }
+
+
+        private CarouselSection _ParentCarouselSection;
+        [JsonIgnore]
+        [BsonIgnore]
+        public CarouselSection ParentCarouselSection
+        {
+            get { return _ParentCarouselSection; }
+            set
+            {
+                if (_ParentCarouselSection != value)
+                {
+                    _ParentCarouselSection = value;
+                    OnPropertyChanged();
+                }
+            }
+        }
+
+        [JsonIgnore]
+        [BsonIgnore]
+        public ICommand Remove => new ActionCommand((p) => ParentCarouselSection.Items.Remove(this));
+
+        [JsonIgnore]
+        [BsonIgnore]
+        public ICommand MoveUp => new ActionCommand((p) =>
+        {
+            var oldIdx = ParentCarouselSection.Items.IndexOf(this);
+            if (oldIdx <= 0) return;
+
+            ParentCarouselSection.Items.Move(oldIdx, oldIdx - 1);
+        });
+
+        [JsonIgnore]
+        [BsonIgnore]
+        public ICommand MoveDown => new ActionCommand((p) =>
+        {
+            var oldIdx = ParentCarouselSection.Items.IndexOf(this);
+            if (oldIdx >= ParentCarouselSection.Items.Count - 1) return;
+
+            ParentCarouselSection.Items.Move(oldIdx, oldIdx + 1);
+        });
+
 
-        [Editor(typeof(ChatElementCollectionEditor<CarouselButton>), typeof(ChatElementCollectionEditor<CarouselButton>))]
-        public ObservableCollection<CarouselButton> Buttons { get; set; } = new ObservableCollection<CarouselButton>();
+        [JsonIgnore]
+        [BsonIgnore]
+        public ICommand AddButton => new ActionCommand((p) => Buttons.Add(new CarouselButton
+        {
+            ContentId = ObjectId.GenerateNewId().ToString(),
+            ParentCarouselItem = this,
+            _id = ObjectId.GenerateNewId().ToString(),
+            Text = "New Carousel Button",
+        }));
     }
 
-    public class CarouselButton : BaseEntity
+    public class CarouselButton : RepeatableBaseEntity
     {
         public string Url { get; set; }
         public CardButtonType Type { get; set; }
         public string VariableValue { get; set; }
         public string NextNodeId { get; set; }
+
+        private string _Text;
+        [JsonIgnore]
+        [BsonIgnore]
+        public string Text
+        {
+            get { return _Text; }
+            set
+            {
+                if (_Text != value)
+                {
+                    _Text = value;
+                    OnPropertyChanged();
+                }
+            }
+        }
+
+        [JsonIgnore]
+        [BsonIgnore]
+        public string ContentId { get; set; }
+
+        [JsonIgnore]
+        [BsonIgnore]
+        public IEnumerable<CardButtonType> Types => Enum.GetValues(typeof(CardButtonType)).Cast<CardButtonType>();
+
+
+        private CarouselItem _ParentCarouselItem;
+        [JsonIgnore]
+        [BsonIgnore]
+        public CarouselItem ParentCarouselItem
+        {
+            get { return _ParentCarouselItem; }
+            set
+            {
+                if (_ParentCarouselItem != value)
+                {
+                    _ParentCarouselItem = value;
+                    OnPropertyChanged();
+                }
+            }
+        }
+
+        [JsonIgnore]
+        [BsonIgnore]
+        public ICommand Remove => new ActionCommand((p) => ParentCarouselItem.Buttons.Remove(this));
+
+        [JsonIgnore]
+        [BsonIgnore]
+        public ICommand MoveUp => new ActionCommand((p) =>
+        {
+            var oldIdx = ParentCarouselItem.Buttons.IndexOf(this);
+            if (oldIdx <= 0) return;
+
+            ParentCarouselItem.Buttons.Move(oldIdx, oldIdx - 1);
+        });
+
+        [JsonIgnore]
+        [BsonIgnore]
+        public ICommand MoveDown => new ActionCommand((p) =>
+        {
+            var oldIdx = ParentCarouselItem.Buttons.IndexOf(this);
+            if (oldIdx >= ParentCarouselItem.Buttons.Count - 1) return;
+
+            ParentCarouselItem.Buttons.Move(oldIdx, oldIdx + 1);
+        });
     }
 
     public enum CardButtonType
diff --git a/ANAConversationStudio/Models/Chat/Sections/EmbeddedHtmlSection.cs b/ANAConversationStudio/Models/Chat/Sections/EmbeddedHtmlSection.cs
index 91f93c2..aa985c0 100644
--- a/ANAConversationStudio/Models/Chat/Sections/EmbeddedHtmlSection.cs
+++ b/ANAConversationStudio/Models/Chat/Sections/EmbeddedHtmlSection.cs
@@ -2,14 +2,8 @@
 
 namespace ANAConversationStudio.Models.Chat.Sections
 {
-    public class EmbeddedHtmlSection : Section
+    public class EmbeddedHtmlSection : TitleCaptionUrlSection
     {
-        [Category("Important")]
-        public string Url { get; set; }
-        public bool IsAuthenticationRequired { get; set; }
-        public string Username { get; set; }
-        public string Password { get; set; }
-
         public EmbeddedHtmlSection()
         {
             SectionType = SectionTypeEnum.EmbeddedHtml;
diff --git a/ANAConversationStudio/Models/Chat/Sections/GifSection.cs b/ANAConversationStudio/Models/Chat/Sections/GifSection.cs
index 187a1cd..dc6f24c 100644
--- a/ANAConversationStudio/Models/Chat/Sections/GifSection.cs
+++ b/ANAConversationStudio/Models/Chat/Sections/GifSection.cs
@@ -2,12 +2,8 @@
 
 namespace ANAConversationStudio.Models.Chat.Sections
 {
-    public class GifSection : Section
+    public class GifSection : TitleCaptionUrlSection
     {
-        [Category("Important")]
-        public string Url { get; set; }
-        public bool PreFetch { get; set; }
-
         public GifSection()
         {
             SectionType = SectionTypeEnum.Gif;
diff --git a/ANAConversationStudio/Models/Chat/Sections/GraphSection.cs b/ANAConversationStudio/Models/Chat/Sections/GraphSection.cs
index 7670261..5d9ceef 100644
--- a/ANAConversationStudio/Models/Chat/Sections/GraphSection.cs
+++ b/ANAConversationStudio/Models/Chat/Sections/GraphSection.cs
@@ -1,8 +1,6 @@
-using ANAConversationStudio.Models;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.ComponentModel;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
 
 namespace ANAConversationStudio.Models.Chat.Sections
 {
@@ -10,9 +8,7 @@ public class GraphSection : Section
     {
         public ObservableCollection<Coordinates> CoordinatesSet { get; set; } = new ObservableCollection<Coordinates>();
 
-        [ExpandableObject]
         public Axis X { get; set; } = new Axis();
-        [ExpandableObject]
         public Axis Y { get; set; } = new Axis();
         public string Caption { get; set; }
         public GraphTypeEnum GraphType { get; set; }
diff --git a/ANAConversationStudio/Models/Chat/Sections/ImageSection.cs b/ANAConversationStudio/Models/Chat/Sections/ImageSection.cs
index 4d2b9e9..ac7dc5e 100644
--- a/ANAConversationStudio/Models/Chat/Sections/ImageSection.cs
+++ b/ANAConversationStudio/Models/Chat/Sections/ImageSection.cs
@@ -2,17 +2,11 @@
 
 namespace ANAConversationStudio.Models.Chat.Sections
 {
-    public class ImageSection : Section
+    public class ImageSection : TitleCaptionUrlSection
     {
-        public int HeightInPixels { get; set; }
-        public int WidthInPixels { get; set; }
-        [Category("Important")]
-        public string Url { get; set; }
-        public double SizeInKb { get; set; }
         public ImageSection()
         {
             SectionType = SectionTypeEnum.Image;
         }
-
     }
 }
\ No newline at end of file
diff --git a/ANAConversationStudio/Models/Chat/Sections/Section.cs b/ANAConversationStudio/Models/Chat/Sections/Section.cs
index 2253f53..cc37406 100644
--- a/ANAConversationStudio/Models/Chat/Sections/Section.cs
+++ b/ANAConversationStudio/Models/Chat/Sections/Section.cs
@@ -1,21 +1,189 @@
-using ANAConversationStudio.Models;
-using ANAConversationStudio.Helpers;
-using System;
+using ANAConversationStudio.Helpers;
+using ANAConversationStudio.UIHelpers;
+using MongoDB.Bson.Serialization.Attributes;
+using Newtonsoft.Json;
+using System.Collections.Generic;
 using System.ComponentModel;
+using System.Windows.Input;
 
-namespace ANAConversationStudio.Models.Chat
+namespace ANAConversationStudio.Models.Chat.Sections
 {
     public class Section : BaseEntity
     {
-        public Section() { }
+        public Section()
+        {
+            FillAlias();
+        }
 
-        [Category("Important")]
-        public SectionTypeEnum SectionType { get; set; }
+        private SectionTypeEnum _SectionType;
+        public SectionTypeEnum SectionType
+        {
+            get { return _SectionType; }
+            set
+            {
+                if (_SectionType != value)
+                {
+                    _SectionType = value;
 
-        public int DelayInMs { get; set; } = Utilities.Rand();
-        public bool Hidden { get; set; } = false;
+                    FillAlias();
+                    OnPropertyChanged();
+                }
+            }
+        }
+
+
+        private int _DelayInMs;
+        public int DelayInMs
+        {
+            get { return _DelayInMs; }
+            set
+            {
+                if (_DelayInMs != value)
+                {
+                    _DelayInMs = value;
+                    OnPropertyChanged();
+                }
+            }
+        }
+
+        private bool _Hidden;
+        public bool Hidden
+        {
+            get { return _Hidden; }
+            set
+            {
+                if (_Hidden != value)
+                {
+                    _Hidden = value;
+                    OnPropertyChanged();
+                }
+            }
+        }
+
+        protected virtual void FillAlias()
+        {
+            Alias = Utilities.TrimText(SectionType + "");
+        }
+
+
+        private ChatNode _ParentNode;
+        [JsonIgnore]
+        [BsonIgnore]
+        public ChatNode ParentNode
+        {
+            get { return _ParentNode; }
+            set
+            {
+                if (_ParentNode != value)
+                {
+                    _ParentNode = value;
+                    OnPropertyChanged();
+                }
+            }
+        }
+
+        [JsonIgnore]
+        [BsonIgnore]
+        public ICommand Remove => new ActionCommand((p) => ParentNode.Sections.Remove(this));
+
+        [JsonIgnore]
+        [BsonIgnore]
+        public ICommand MoveUp => new ActionCommand((p) =>
+        {
+            var oldIdx = ParentNode.Sections.IndexOf(this);
+            if (oldIdx <= 0) return;
+
+            ParentNode.Sections.Move(oldIdx, oldIdx - 1);
+        });
+
+        [JsonIgnore]
+        [BsonIgnore]
+        public ICommand MoveDown => new ActionCommand((p) =>
+        {
+            var oldIdx = ParentNode.Sections.IndexOf(this);
+            if (oldIdx >= ParentNode.Sections.Count - 1) return;
+
+            ParentNode.Sections.Move(oldIdx, oldIdx + 1);
+        });
+
+
+        [JsonIgnore]
+        [BsonIgnore]
+        public string ContentId { get; set; }
+
+        [JsonIgnore]
+        [BsonIgnore]
+        public string ContentEmotion { get; set; }
     }
 
+    public class TitleCaptionSection : Section
+    {
+        //Content
+        private string _Title;
+        [JsonIgnore]
+        [BsonIgnore]
+        public string Title
+        {
+            get { return _Title; }
+            set
+            {
+                if (_Title != value)
+                {
+                    _Title = value;
+
+                    FillAlias();
+                    OnPropertyChanged();
+                }
+            }
+        }
+
+        private string _Caption;
+        [JsonIgnore]
+        [BsonIgnore]
+        public string Caption
+        {
+            get { return _Caption; }
+            set
+            {
+                if (_Caption != value)
+                {
+                    _Caption = value;
+
+                    FillAlias();
+                    OnPropertyChanged();
+                }
+            }
+        }
+
+        protected override void FillAlias()
+        {
+            var text = "";
+            if (!string.IsNullOrWhiteSpace(Title))
+                text = Title;
+            else if (!string.IsNullOrWhiteSpace(Caption))
+                text = Caption;
+            else
+                text = SectionType + "";
+
+            Alias = Utilities.TrimText(text);
+        }
+    }
+    public class TitleCaptionUrlSection : TitleCaptionSection
+    {
+        private string _Url;
+        public string Url
+        {
+            get { return _Url; }
+            set
+            {
+                if (_Url != value)
+                {
+                    _Url = value;
+                    OnPropertyChanged();
+                }
+            }
+        }
+    }
     public enum SectionTypeEnum
     {
         Image, Text, Graph, Gif, Audio, Video, Link, EmbeddedHtml, Carousel, PrintOTP
diff --git a/ANAConversationStudio/Models/Chat/Sections/TextSection.cs b/ANAConversationStudio/Models/Chat/Sections/TextSection.cs
index 09db1c5..e08d388 100644
--- a/ANAConversationStudio/Models/Chat/Sections/TextSection.cs
+++ b/ANAConversationStudio/Models/Chat/Sections/TextSection.cs
@@ -1,7 +1,39 @@
-namespace ANAConversationStudio.Models.Chat.Sections
+using ANAConversationStudio.Helpers;
+using MongoDB.Bson.Serialization.Attributes;
+using Newtonsoft.Json;
+
+namespace ANAConversationStudio.Models.Chat.Sections
 {
     public class TextSection : Section
     {
-        public TextSection() { SectionType = SectionTypeEnum.Text; }
+        public TextSection()
+        {
+            SectionType = SectionTypeEnum.Text;
+            FillAlias();
+        }
+
+        //Content
+        private string _Text;
+        [JsonIgnore]
+        [BsonIgnore]
+        public string Text
+        {
+            get { return _Text; }
+            set
+            {
+                if (_Text != value)
+                {
+                    _Text = value;
+
+                    FillAlias();
+                    OnPropertyChanged();
+                }
+            }
+        }
+
+        protected override void FillAlias()
+        {
+            Alias = Utilities.TrimText(string.IsNullOrWhiteSpace(_Text) ? SectionType + "" : _Text);
+        }
     }
 }
\ No newline at end of file
diff --git a/ANAConversationStudio/Models/Chat/Sections/VideoSection.cs b/ANAConversationStudio/Models/Chat/Sections/VideoSection.cs
index eadbfd7..fa522e4 100644
--- a/ANAConversationStudio/Models/Chat/Sections/VideoSection.cs
+++ b/ANAConversationStudio/Models/Chat/Sections/VideoSection.cs
@@ -2,14 +2,8 @@
 
 namespace ANAConversationStudio.Models.Chat.Sections
 {
-    public class VideoSection : Section
+    public class VideoSection : TitleCaptionUrlSection
     {
-        public int HeightInPixels { get; set; }
-        public int WidthInPixels { get; set; }
-        [Category("Important")]
-        public string Url { get; set; }
-        public double SizeInKb { get; set; }
-        public int DurationInSec { get; set; }
         public VideoSection() { SectionType = SectionTypeEnum.Video; }
     }
 }
\ No newline at end of file
diff --git a/ANAConversationStudio/Models/LayoutPoint.cs b/ANAConversationStudio/Models/LayoutPoint.cs
index 1ff4879..318a0d1 100644
--- a/ANAConversationStudio/Models/LayoutPoint.cs
+++ b/ANAConversationStudio/Models/LayoutPoint.cs
@@ -1,14 +1,14 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ANAConversationStudio.Models
+namespace ANAConversationStudio.Models
 {
     public class LayoutPoint
     {
+        public LayoutPoint(double X, double Y)
+        {
+            this.X = X;
+            this.Y = Y;
+        }
+        public LayoutPoint() { }
         public double X { get; set; }
         public double Y { get; set; }
     }
-}
+}
\ No newline at end of file
diff --git a/ANAConversationStudio/Models/MouseHandlingMode.cs b/ANAConversationStudio/Models/MouseHandlingMode.cs
index a7d2b5d..69c57c9 100644
--- a/ANAConversationStudio/Models/MouseHandlingMode.cs
+++ b/ANAConversationStudio/Models/MouseHandlingMode.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace ANAConversationStudio
+namespace ANAConversationStudio
 {
     /// <summary>
     /// Defines the current state of the mouse handling logic.
diff --git a/ANAConversationStudio/Properties/AssemblyInfo.cs b/ANAConversationStudio/Properties/AssemblyInfo.cs
index 75ecd99..7abd8e1 100644
--- a/ANAConversationStudio/Properties/AssemblyInfo.cs
+++ b/ANAConversationStudio/Properties/AssemblyInfo.cs
@@ -51,5 +51,5 @@
 // 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("3.28.0.0")]
-[assembly: AssemblyFileVersion("3.28.0.0")]
+[assembly: AssemblyVersion("4.1.0.0")]
+[assembly: AssemblyFileVersion("4.1.0.0")]
diff --git a/ANAConversationStudio/Resources/Gridlines.png b/ANAConversationStudio/Resources/Gridlines.png
new file mode 100644
index 0000000..314763d
Binary files /dev/null and b/ANAConversationStudio/Resources/Gridlines.png differ
diff --git a/ANAConversationStudio/Resources/segoe-mdl2-assets.ttf b/ANAConversationStudio/Resources/segoe-mdl2-assets.ttf
new file mode 100644
index 0000000..d3d1ee2
Binary files /dev/null and b/ANAConversationStudio/Resources/segoe-mdl2-assets.ttf differ
diff --git a/ANAConversationStudio/Styles/EditorTemplates.xaml b/ANAConversationStudio/Styles/EditorTemplates.xaml
new file mode 100644
index 0000000..88d4505
--- /dev/null
+++ b/ANAConversationStudio/Styles/EditorTemplates.xaml
@@ -0,0 +1,467 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:uc="clr-namespace:ANAConversationStudio.UserControls"
+                    xmlns:ui="clr-namespace:ANAConversationStudio.UIHelpers"
+                    xmlns:views="clr-namespace:ANAConversationStudio.Views"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <FontFamily x:Key="MDL2Assets">pack://application:,,,/Resources/#Segoe MDL2 Assets</FontFamily>
+    <Style x:Key="EditorItemBorderStyle" TargetType="Border" >
+        <Setter Property="BorderBrush" Value="{DynamicResource PrimaryHueDarkBrush}"/>
+        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="Padding" Value="10"/>
+        <Setter Property="Margin" Value="10"/>
+    </Style>
+    <ui:ButtonSectionTypeSymbolConverter x:Key="ButtonSectionTypeSymbolConverter"/>
+    <views:ButtonTypeToFieldVisibilityConverter x:Key="ButtonTypeToFieldVisibilityConverter"/>
+    <BooleanToVisibilityConverter x:Key="B2V"/>
+    
+    <Style x:Key="SectionTypeIconTextblockStyle" TargetType="TextBlock">
+        <Setter Property="FontFamily" Value="{StaticResource MDL2Assets}"/>
+        <Setter Property="FontSize" Value="20"/>
+        <Setter Property="ToolTip" >
+            <Setter.Value>
+                <TextBlock>
+                    <Run Text="{Binding SectionType}" /><Run Text=" Section" />
+                </TextBlock>
+            </Setter.Value>
+        </Setter>
+        <Setter Property="Margin" Value="0,0,10,0"/>
+        <Setter Property="Text" Value="{Binding SectionType, Converter={StaticResource ButtonSectionTypeSymbolConverter}}"/>
+        <Setter Property="VerticalAlignment" Value="Center"/>
+    </Style>
+    <Style x:Key="ButtonTypeIconTextblockStyle" TargetType="TextBlock">
+        <Setter Property="FontFamily" Value="{StaticResource MDL2Assets}"/>
+        <Setter Property="FontSize" Value="20"/>
+        <Setter Property="ToolTip" >
+            <Setter.Value>
+                <TextBlock>
+                    <Run Text="{Binding ButtonType}" /><Run Text=" Button" />
+                </TextBlock>
+            </Setter.Value>
+        </Setter>
+        <Setter Property="Margin" Value="0,0,15,0"/>
+        <Setter Property="Text" Value="{Binding ButtonType, Converter={StaticResource ButtonSectionTypeSymbolConverter}}"/>
+        <Setter Property="VerticalAlignment" Value="Center"/>
+    </Style>
+    <Style x:Key="ToolButtonStyle" TargetType="Button" BasedOn="{StaticResource MaterialDesignToolButton}" >
+        <Setter Property="Margin" Value="5,0" />
+        <Setter Property="Padding" Value="0" />
+        <Setter Property="Height" Value="Auto" />
+        <Setter Property="FontFamily" Value="{StaticResource MDL2Assets}" />
+        <Setter Property="Foreground" Value="White" />
+        <Setter Property="VerticalAlignment" Value="Center" />
+    </Style>
+    
+    <Style x:Key="MoveUpButtonStyle" BasedOn="{StaticResource ToolButtonStyle}" TargetType="Button">
+        <Setter Property="Content" Value="&#xE96D;" />
+        <Setter Property="Command" Value="{Binding MoveUp}" />
+        <Setter Property="ToolTip" Value="Move Up" />
+    </Style>
+    <Style x:Key="MoveDownButtonStyle" BasedOn="{StaticResource ToolButtonStyle}" TargetType="Button">
+        <Setter Property="Content" Value="&#xE96E;" />
+        <Setter Property="Command" Value="{Binding MoveDown}" />
+        <Setter Property="ToolTip" Value="Move Down" />
+    </Style>
+    <Style x:Key="MoveLeftButtonStyle" BasedOn="{StaticResource ToolButtonStyle}" TargetType="Button">
+        <Setter Property="Content" Value="&#xE96F;" />
+        <Setter Property="Command" Value="{Binding MoveUp}" />
+        <Setter Property="ToolTip" Value="Move Left" />
+    </Style>
+    <Style x:Key="MoveRightButtonStyle" BasedOn="{StaticResource ToolButtonStyle}" TargetType="Button">
+        <Setter Property="Content" Value="&#xE970;" />
+        <Setter Property="Command" Value="{Binding MoveDown}" />
+        <Setter Property="ToolTip" Value="Move Right" />
+    </Style>
+    <Style x:Key="DeleteButtonStyle" BasedOn="{StaticResource ToolButtonStyle}" TargetType="Button">
+        <Setter Property="Content" Value="&#xE74D;" />
+        <Setter Property="Command" Value="{Binding Remove}" />
+        <Setter Property="Margin" Value="5,0,0,0" />
+        <Setter Property="ToolTip" Value="Remove" />
+    </Style>
+    <Style x:Key="GroupHeaderTextBlockStyle" TargetType="TextBlock">
+        <Setter Property="Height" Value="14.7"/>
+    </Style>
+    <Style x:Key="AddButtonStyle" BasedOn="{StaticResource ToolButtonStyle}" TargetType="Button">
+        <Setter Property="Content" Value="&#xE948;" />
+    </Style>
+    <DataTemplate x:Key="TextSectionEditTemplate">
+        <Grid Margin="5">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="Auto"/>
+                <ColumnDefinition/>
+                <ColumnDefinition Width="Auto"/>
+                <ColumnDefinition Width="Auto"/>
+                <ColumnDefinition Width="Auto"/>
+            </Grid.ColumnDefinitions>
+            <TextBlock Style="{StaticResource SectionTypeIconTextblockStyle}" Grid.Column="0"/>
+            <TextBox Grid.Column="1" Text="{Binding Text, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" AcceptsReturn="True" AcceptsTab="True" TextWrapping="Wrap"/>
+            <Button Grid.Column="2" Style="{StaticResource MoveUpButtonStyle}" Foreground="{DynamicResource PrimaryHueDarkBrush}" VerticalAlignment="Center"/>
+            <Button Grid.Column="3" Style="{StaticResource MoveDownButtonStyle}" Foreground="{DynamicResource PrimaryHueDarkBrush}" VerticalAlignment="Center"/>
+            <Button Grid.Column="4" Style="{StaticResource DeleteButtonStyle}" Foreground="{DynamicResource PrimaryHueDarkBrush}" VerticalAlignment="Center"/>
+        </Grid>
+    </DataTemplate>
+    <DataTemplate x:Key="TitleCaptionUrlSectionEditTemplate">
+        <GroupBox Header="{Binding}">
+            <GroupBox.HeaderTemplate>
+                <DataTemplate>
+                    <Grid >
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="Auto"/>
+                            <ColumnDefinition/>
+                            <ColumnDefinition Width="Auto"/>
+                            <ColumnDefinition Width="Auto"/>
+                            <ColumnDefinition Width="Auto"/>
+                        </Grid.ColumnDefinitions>
+                        <TextBlock Style="{StaticResource SectionTypeIconTextblockStyle}" Grid.Column="0"/>
+                        <TextBlock VerticalAlignment="Center" Grid.Column="1">
+                            <Run  Text="Section: "/><Run  Text="{Binding Alias}"/>
+                        </TextBlock>
+                        <Button Grid.Column="2" Style="{StaticResource MoveUpButtonStyle}"/>
+                        <Button Grid.Column="3" Style="{StaticResource MoveDownButtonStyle}"/>
+                        <Button Grid.Column="4" Style="{StaticResource DeleteButtonStyle}"/>
+                    </Grid>
+                </DataTemplate>
+            </GroupBox.HeaderTemplate>
+            <StackPanel>
+                <uc:TableRowUserControl Label="Title">
+                    <uc:TableRowUserControl.Field>
+                        <TextBox Text="{Binding Title, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" AcceptsReturn="True" AcceptsTab="True" TextWrapping="Wrap"/>
+                    </uc:TableRowUserControl.Field>
+                </uc:TableRowUserControl>
+                <uc:TableRowUserControl Label="Url">
+                    <uc:TableRowUserControl.Field>
+                        <TextBox Text="{Binding Url, Mode=TwoWay}" />
+                    </uc:TableRowUserControl.Field>
+                </uc:TableRowUserControl>
+                <uc:TableRowUserControl Label="Caption">
+                    <uc:TableRowUserControl.Field>
+                        <TextBox Text="{Binding Caption, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" AcceptsReturn="True" AcceptsTab="True" TextWrapping="Wrap"/>
+                    </uc:TableRowUserControl.Field>
+                </uc:TableRowUserControl>
+            </StackPanel>
+        </GroupBox>
+    </DataTemplate>
+    <DataTemplate x:Key="ChatButtonEditTemplate">
+        <GroupBox Header="{Binding}">
+            <GroupBox.HeaderTemplate>
+                <DataTemplate>
+                    <Grid >
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="Auto"/>
+                            <ColumnDefinition/>
+                            <ColumnDefinition Width="Auto"/>
+                            <ColumnDefinition Width="Auto"/>
+                            <ColumnDefinition Width="Auto"/>
+                        </Grid.ColumnDefinitions>
+                        <TextBlock Style="{StaticResource ButtonTypeIconTextblockStyle}" />
+                        <TextBlock VerticalAlignment="Center" Grid.Column="1">
+                            <Run Text="Button: "/><Run  Text="{Binding Alias}"/>
+                        </TextBlock>
+                        <Button Grid.Column="2" Style="{StaticResource MoveUpButtonStyle}"/>
+                        <Button Grid.Column="3" Style="{StaticResource MoveDownButtonStyle}"/>
+                        <Button Grid.Column="4" Style="{StaticResource DeleteButtonStyle}"/>
+                    </Grid>
+                </DataTemplate>
+            </GroupBox.HeaderTemplate>
+            <StackPanel>
+                <uc:TableRowUserControl Label="Type">
+                    <uc:TableRowUserControl.Field>
+                        <ComboBox SelectedItem="{Binding ButtonType, Mode=TwoWay}" ItemsSource="{Binding ButtonTypes}"/>
+                    </uc:TableRowUserControl.Field>
+                </uc:TableRowUserControl>
+                <uc:TableRowUserControl Label="Text">
+                    <uc:TableRowUserControl.Field>
+                        <TextBox Text="{Binding ButtonText, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" />
+                    </uc:TableRowUserControl.Field>
+                </uc:TableRowUserControl>
+                <uc:TableRowUserControl Label="Placeholder" Visibility="{Binding ButtonType, Converter={StaticResource ButtonTypeToFieldVisibilityConverter}, ConverterParameter=PlaceholderText}">
+                    <uc:TableRowUserControl.Field>
+                        <TextBox Text="{Binding PlaceholderText, Mode=TwoWay}" />
+                    </uc:TableRowUserControl.Field>
+                </uc:TableRowUserControl>
+                <uc:TableRowUserControl Label="DeepLink Url" Visibility="{Binding ButtonType, Converter={StaticResource ButtonTypeToFieldVisibilityConverter}, ConverterParameter=DeepLinkUrl}">
+                    <uc:TableRowUserControl.Field>
+                        <TextBox Text="{Binding DeepLinkUrl, Mode=TwoWay}" />
+                    </uc:TableRowUserControl.Field>
+                </uc:TableRowUserControl>
+                <uc:TableRowUserControl Label="Url" Visibility="{Binding ButtonType, Converter={StaticResource ButtonTypeToFieldVisibilityConverter}, ConverterParameter=Url}">
+                    <uc:TableRowUserControl.Field>
+                        <TextBox Text="{Binding Url, Mode=TwoWay}" />
+                    </uc:TableRowUserControl.Field>
+                </uc:TableRowUserControl>
+
+                <uc:TableRowUserControl Label="Variable Value">
+                    <uc:TableRowUserControl.Field>
+                        <TextBox Text="{Binding VariableValue, Mode=TwoWay}" />
+                    </uc:TableRowUserControl.Field>
+                </uc:TableRowUserControl>
+                <uc:TableRowUserControl Label="Prefix" Visibility="{Binding ButtonType,Converter={StaticResource ButtonTypeToFieldVisibilityConverter}, ConverterParameter=PrefixText}">
+                    <uc:TableRowUserControl.Field>
+                        <TextBox Text="{Binding PrefixText, Mode=TwoWay}" />
+                    </uc:TableRowUserControl.Field>
+                </uc:TableRowUserControl>
+                <uc:TableRowUserControl Label="Postfix" Visibility="{Binding ButtonType, Converter={StaticResource ButtonTypeToFieldVisibilityConverter}, ConverterParameter=PostfixText}">
+                    <uc:TableRowUserControl.Field>
+                        <TextBox Text="{Binding PostfixText, Mode=TwoWay}" />
+                    </uc:TableRowUserControl.Field>
+                </uc:TableRowUserControl>
+
+                <uc:TableRowUserControl Label="API Response Match Key" Visibility="{Binding ButtonType, Converter={StaticResource ButtonTypeToFieldVisibilityConverter}, ConverterParameter=APIResponseMatchKey}">
+                    <uc:TableRowUserControl.Field>
+                        <TextBox Text="{Binding APIResponseMatchKey, Mode=TwoWay}" />
+                    </uc:TableRowUserControl.Field>
+                </uc:TableRowUserControl>
+                <uc:TableRowUserControl Label="API Response Match Value" Visibility="{Binding ButtonType,Converter={StaticResource ButtonTypeToFieldVisibilityConverter}, ConverterParameter=APIResponseMatchValue}">
+                    <uc:TableRowUserControl.Field>
+                        <TextBox Text="{Binding APIResponseMatchValue, Mode=TwoWay}" />
+                    </uc:TableRowUserControl.Field>
+                </uc:TableRowUserControl>
+
+                <uc:TableRowUserControl Label="Does Repeat" >
+                    <uc:TableRowUserControl.Field>
+                        <CheckBox IsChecked="{Binding DoesRepeat, Mode=TwoWay}" />
+                    </uc:TableRowUserControl.Field>
+                </uc:TableRowUserControl>
+                <StackPanel Visibility="{Binding DoesRepeat, Converter={StaticResource B2V}}">
+                    <uc:TableRowUserControl Label="Repeat On">
+                        <uc:TableRowUserControl.Field>
+                            <TextBox Text="{Binding RepeatOn, Mode=TwoWay}" />
+                        </uc:TableRowUserControl.Field>
+                    </uc:TableRowUserControl>
+                    <uc:TableRowUserControl Label="Repeat As">
+                        <uc:TableRowUserControl.Field>
+                            <TextBox Text="{Binding RepeatAs, Mode=TwoWay}" />
+                        </uc:TableRowUserControl.Field>
+                    </uc:TableRowUserControl>
+                    <uc:TableRowUserControl Label="Start Position">
+                        <uc:TableRowUserControl.Field>
+                            <TextBox Text="{Binding StartPosition, Mode=TwoWay}" InputScope="Number"/>
+                        </uc:TableRowUserControl.Field>
+                    </uc:TableRowUserControl>
+                    <uc:TableRowUserControl Label="Max Repeats">
+                        <uc:TableRowUserControl.Field>
+                            <TextBox Text="{Binding MaxRepeats, Mode=TwoWay}" InputScope="Number"/>
+                        </uc:TableRowUserControl.Field>
+                    </uc:TableRowUserControl>
+                </StackPanel>
+
+                <Grid HorizontalAlignment="Stretch" Margin="0,20">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition/>
+                        <ColumnDefinition/>
+                        <ColumnDefinition/>
+                    </Grid.ColumnDefinitions>
+                    <Grid.Resources>
+                        <Style TargetType="CheckBox" BasedOn="{StaticResource {x:Type CheckBox}}">
+                            <Setter Property="FontWeight" Value="Bold" />
+                            <Setter Property="HorizontalAlignment" Value="Center" />
+                        </Style>
+                    </Grid.Resources>
+                    <CheckBox IsChecked="{Binding DefaultButton, Mode=TwoWay}" Content="Is Default" Grid.Column="0"/>
+                    <CheckBox IsChecked="{Binding PostToChat, Mode=TwoWay}" Content="Post To Chat" Grid.Column="1"/>
+                    <CheckBox IsChecked="{Binding Hidden, Mode=TwoWay}" Content="Is Hidden" Grid.Column="2"/>
+                </Grid>
+            </StackPanel>
+        </GroupBox>
+    </DataTemplate>
+
+    <DataTemplate x:Key="CarouselSectionEditTemplate">
+        <GroupBox Header="{Binding}">
+            <GroupBox.HeaderTemplate>
+                <DataTemplate>
+                    <Grid >
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="Auto"/>
+                            <ColumnDefinition/>
+                            <ColumnDefinition Width="Auto"/>
+                            <ColumnDefinition Width="Auto"/>
+                            <ColumnDefinition Width="Auto"/>
+                            <ColumnDefinition Width="Auto"/>
+                        </Grid.ColumnDefinitions>
+                        <TextBlock Style="{StaticResource SectionTypeIconTextblockStyle}" />
+                        <TextBlock VerticalAlignment="Center" Grid.Column="1">
+                            <Run Text="Section: "/><Run  Text="{Binding Alias}"/>
+                        </TextBlock>
+                        <Button Grid.Column="2" Style="{StaticResource MoveUpButtonStyle}"/>
+                        <Button Grid.Column="3" Style="{StaticResource MoveDownButtonStyle}"/>
+                        <Button Grid.Column="4" Style="{StaticResource AddButtonStyle}" ToolTip="Add Carousel Item" Command="{Binding AddItem}"/>
+                        <Button Grid.Column="5" Style="{StaticResource DeleteButtonStyle}"/>
+                    </Grid>
+                </DataTemplate>
+            </GroupBox.HeaderTemplate>
+            <StackPanel Grid.Column="0">
+                <uc:TableRowUserControl Label="Title">
+                    <uc:TableRowUserControl.Field>
+                        <TextBox Text="{Binding Title, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" AcceptsReturn="True" AcceptsTab="True" TextWrapping="Wrap"/>
+                    </uc:TableRowUserControl.Field>
+                </uc:TableRowUserControl>
+                <uc:TableRowUserControl Label="Caption">
+                    <uc:TableRowUserControl.Field>
+                        <TextBox Text="{Binding Caption, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" AcceptsReturn="True" AcceptsTab="True" TextWrapping="Wrap"/>
+                    </uc:TableRowUserControl.Field>
+                </uc:TableRowUserControl>
+                <ScrollViewer HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Disabled" Padding="-10,0" HorizontalAlignment="Center">
+                    <ItemsControl ItemsSource="{Binding Items}">
+                        <ItemsControl.ItemsPanel>
+                            <ItemsPanelTemplate>
+                                <VirtualizingStackPanel Orientation="Horizontal"/>
+                            </ItemsPanelTemplate>
+                        </ItemsControl.ItemsPanel>
+                        <ItemsControl.ItemTemplate>
+                            <DataTemplate>
+                                <GroupBox Header="{Binding}">
+                                    <GroupBox.HeaderTemplate>
+                                        <DataTemplate>
+                                            <Grid>
+                                                <Grid.ColumnDefinitions>
+                                                    <ColumnDefinition/>
+                                                    <ColumnDefinition Width="Auto"/>
+                                                    <ColumnDefinition Width="Auto"/>
+                                                    <ColumnDefinition Width="Auto"/>
+                                                    <ColumnDefinition Width="Auto"/>
+                                                </Grid.ColumnDefinitions>
+                                                <TextBlock VerticalAlignment="Center">
+                                                    <Run Text="Carousel Item: "/><Run Text="{Binding Title}"/>
+                                                </TextBlock>
+                                                <Button Grid.Column="1" Style="{StaticResource MoveLeftButtonStyle}"/>
+                                                <Button Grid.Column="2" Style="{StaticResource MoveRightButtonStyle}"/>
+                                                <Button Grid.Column="3" Style="{StaticResource AddButtonStyle}" ToolTip="Add Carousel Button" Command="{Binding AddButton}"/>
+                                                <Button Grid.Column="4" Style="{StaticResource DeleteButtonStyle}"/>
+                                            </Grid>
+                                        </DataTemplate>
+                                    </GroupBox.HeaderTemplate>
+                                    <StackPanel>
+                                        <uc:TableRowUserControl Label="Title">
+                                            <uc:TableRowUserControl.Field>
+                                                <TextBox Text="{Binding Title, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" AcceptsReturn="True" AcceptsTab="True" TextWrapping="Wrap"/>
+                                            </uc:TableRowUserControl.Field>
+                                        </uc:TableRowUserControl>
+                                        <uc:TableRowUserControl Label="Caption">
+                                            <uc:TableRowUserControl.Field>
+                                                <TextBox Text="{Binding Caption, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" AcceptsReturn="True" AcceptsTab="True" TextWrapping="Wrap"/>
+                                            </uc:TableRowUserControl.Field>
+                                        </uc:TableRowUserControl>
+                                        <uc:TableRowUserControl Label="ImageUrl">
+                                            <uc:TableRowUserControl.Field>
+                                                <TextBox Text="{Binding ImageUrl, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"/>
+                                            </uc:TableRowUserControl.Field>
+                                        </uc:TableRowUserControl>
+
+                                        <uc:TableRowUserControl Label="Does Repeat" >
+                                            <uc:TableRowUserControl.Field>
+                                                <CheckBox IsChecked="{Binding DoesRepeat, Mode=TwoWay}" />
+                                            </uc:TableRowUserControl.Field>
+                                        </uc:TableRowUserControl>
+                                        <StackPanel Visibility="{Binding DoesRepeat, Converter={StaticResource B2V}}">
+                                            <uc:TableRowUserControl Label="Repeat On">
+                                                <uc:TableRowUserControl.Field>
+                                                    <TextBox Text="{Binding RepeatOn, Mode=TwoWay}" />
+                                                </uc:TableRowUserControl.Field>
+                                            </uc:TableRowUserControl>
+                                            <uc:TableRowUserControl Label="Repeat As">
+                                                <uc:TableRowUserControl.Field>
+                                                    <TextBox Text="{Binding RepeatAs, Mode=TwoWay}" />
+                                                </uc:TableRowUserControl.Field>
+                                            </uc:TableRowUserControl>
+                                            <uc:TableRowUserControl Label="Start Position">
+                                                <uc:TableRowUserControl.Field>
+                                                    <TextBox Text="{Binding StartPosition, Mode=TwoWay}" InputScope="Number"/>
+                                                </uc:TableRowUserControl.Field>
+                                            </uc:TableRowUserControl>
+                                            <uc:TableRowUserControl Label="Max Repeats">
+                                                <uc:TableRowUserControl.Field>
+                                                    <TextBox Text="{Binding MaxRepeats, Mode=TwoWay}" InputScope="Number"/>
+                                                </uc:TableRowUserControl.Field>
+                                            </uc:TableRowUserControl>
+                                        </StackPanel>
+                                        <ItemsControl ItemsSource="{Binding Buttons}">
+                                            <ItemsControl.ItemTemplate>
+                                                <DataTemplate>
+                                                    <GroupBox Header="{Binding}">
+                                                        <GroupBox.HeaderTemplate>
+                                                            <DataTemplate>
+                                                                <Grid >
+                                                                    <Grid.ColumnDefinitions>
+                                                                        <ColumnDefinition/>
+                                                                        <ColumnDefinition Width="Auto"/>
+                                                                        <ColumnDefinition Width="Auto"/>
+                                                                        <ColumnDefinition Width="Auto"/>
+                                                                    </Grid.ColumnDefinitions>
+                                                                    <TextBlock VerticalAlignment="Center">
+                                                                        <Run Text="Carousel Button: "/><Run Text="{Binding Text}"/>
+                                                                    </TextBlock>
+                                                                    <Button Grid.Column="1" Style="{StaticResource MoveUpButtonStyle}"/>
+                                                                    <Button Grid.Column="2" Style="{StaticResource MoveDownButtonStyle}"/>
+                                                                    <Button Grid.Column="3" Style="{StaticResource DeleteButtonStyle}"/>
+                                                                </Grid>
+                                                            </DataTemplate>
+                                                        </GroupBox.HeaderTemplate>
+                                                        <StackPanel>
+                                                            <uc:TableRowUserControl Label="Text">
+                                                                <uc:TableRowUserControl.Field>
+                                                                    <TextBox Text="{Binding Text, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" AcceptsReturn="True" AcceptsTab="True" TextWrapping="Wrap"/>
+                                                                </uc:TableRowUserControl.Field>
+                                                            </uc:TableRowUserControl>
+                                                            <uc:TableRowUserControl Label="Url">
+                                                                <uc:TableRowUserControl.Field>
+                                                                    <TextBox Text="{Binding Url, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"/>
+                                                                </uc:TableRowUserControl.Field>
+                                                            </uc:TableRowUserControl>
+                                                            <uc:TableRowUserControl Label="Variable Value">
+                                                                <uc:TableRowUserControl.Field>
+                                                                    <TextBox Text="{Binding VariableValue, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" AcceptsReturn="True" AcceptsTab="True" TextWrapping="Wrap"/>
+                                                                </uc:TableRowUserControl.Field>
+                                                            </uc:TableRowUserControl>
+                                                            <uc:TableRowUserControl Label="Next Node Id">
+                                                                <uc:TableRowUserControl.Field>
+                                                                    <TextBox Text="{Binding NextNodeId, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"/>
+                                                                </uc:TableRowUserControl.Field>
+                                                            </uc:TableRowUserControl>
+
+                                                            <uc:TableRowUserControl Label="Type">
+                                                                <uc:TableRowUserControl.Field>
+                                                                    <ComboBox SelectedItem="{Binding Type, Mode=TwoWay}" ItemsSource="{Binding Types}"/>
+                                                                </uc:TableRowUserControl.Field>
+                                                            </uc:TableRowUserControl>
+
+                                                            <uc:TableRowUserControl Label="Does Repeat" >
+                                                                <uc:TableRowUserControl.Field>
+                                                                    <CheckBox IsChecked="{Binding DoesRepeat, Mode=TwoWay}" />
+                                                                </uc:TableRowUserControl.Field>
+                                                            </uc:TableRowUserControl>
+                                                            <StackPanel Visibility="{Binding DoesRepeat, Converter={StaticResource B2V}}">
+                                                                <uc:TableRowUserControl Label="Repeat On">
+                                                                    <uc:TableRowUserControl.Field>
+                                                                        <TextBox Text="{Binding RepeatOn, Mode=TwoWay}" />
+                                                                    </uc:TableRowUserControl.Field>
+                                                                </uc:TableRowUserControl>
+                                                                <uc:TableRowUserControl Label="Repeat As">
+                                                                    <uc:TableRowUserControl.Field>
+                                                                        <TextBox Text="{Binding RepeatAs, Mode=TwoWay}" />
+                                                                    </uc:TableRowUserControl.Field>
+                                                                </uc:TableRowUserControl>
+                                                                <uc:TableRowUserControl Label="Start Position">
+                                                                    <uc:TableRowUserControl.Field>
+                                                                        <TextBox Text="{Binding StartPosition, Mode=TwoWay}" InputScope="Number"/>
+                                                                    </uc:TableRowUserControl.Field>
+                                                                </uc:TableRowUserControl>
+                                                                <uc:TableRowUserControl Label="Max Repeats">
+                                                                    <uc:TableRowUserControl.Field>
+                                                                        <TextBox Text="{Binding MaxRepeats, Mode=TwoWay}" InputScope="Number"/>
+                                                                    </uc:TableRowUserControl.Field>
+                                                                </uc:TableRowUserControl>
+                                                            </StackPanel>
+                                                        </StackPanel>
+                                                    </GroupBox>
+                                                </DataTemplate>
+                                            </ItemsControl.ItemTemplate>
+                                        </ItemsControl>
+                                    </StackPanel>
+                                </GroupBox>
+                            </DataTemplate>
+                        </ItemsControl.ItemTemplate>
+                    </ItemsControl>
+                </ScrollViewer>
+            </StackPanel>
+        </GroupBox>
+    </DataTemplate>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/ANAConversationStudio/Styles/SharedVisualTemplates.xaml b/ANAConversationStudio/Styles/SharedVisualTemplates.xaml
index 864306f..f9d9fdc 100644
--- a/ANAConversationStudio/Styles/SharedVisualTemplates.xaml
+++ b/ANAConversationStudio/Styles/SharedVisualTemplates.xaml
@@ -2,51 +2,116 @@
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:NetworkUI="clr-namespace:NetworkUI;assembly=NetworkUI"
-    xmlns:NetworkModel="clr-namespace:ANAConversationStudio.Models"    
     >
 
     <BooleanToVisibilityConverter
         x:Key="booleanToVisibilityConverter" 
         />
 
-    <!-- The border brush for nodes. -->
     <SolidColorBrush
-        x:Key="nodeBorderBrush"
-        Color="Black"
+        x:Key="connectorBackgroundBrush"
+        Color="White"
         />
 
-    <!-- The fill brush for nodes. -->
-    <SolidColorBrush x:Key="nodeFillBrush" Color="#ccc" Opacity="0.8"/>
-    <!--<LinearGradientBrush
-        x:Key="nodeFillBrush"
-        StartPoint="0,0"
-        EndPoint="0,1"
-        >
-        <GradientStop Color="White" Offset="0" />
-        <GradientStop Color="#7FC9FF" Offset="0.6" />
-    </LinearGradientBrush>-->
+    <!-- Default style and control-template for 'NodeItem'. -->
+    <Style TargetType="NetworkUI:NodeItem" >
 
-    <!-- The brush for connections. -->
-    <SolidColorBrush
-        x:Key="connectionBrush"
-        Color="Black"
-        />
+        <!-- Data-bind the parent NetworkView. -->
+        <Setter Property="ParentNetworkView" Value="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type NetworkUI:NetworkView}}}" />
 
-    <!-- The brush for connectors. -->
-    <SolidColorBrush
-        x:Key="connectorBackgroundBrush"
-        Color="White"
-        />
+        <!-- Set the position of the node within the canvas. -->
+        <Setter
+            Property="Canvas.Left"
+            Value="{Binding X, RelativeSource={RelativeSource Self}, Mode=TwoWay}"
+            />
+        <Setter
+            Property="Canvas.Top"
+            Value="{Binding Y, RelativeSource={RelativeSource Self}, Mode=TwoWay}"
+            />
 
-    <!--
-    Define a style for 'NodeItem'.
-    
-    Binds 'X' and 'Y' in the view-model (the 'NodeViewModel' class)
-    to 'X' and 'Y' in the NodeItem class.
-    
-    This sets the position of the node within the Canvas.
-    -->
-    <Style TargetType="{x:Type NetworkUI:NodeItem}">
+        <!-- Set the z-order of the node within the canvas. -->
+        <Setter
+            Property="Canvas.ZIndex"
+            Value="{Binding ZIndex, RelativeSource={RelativeSource Self}, Mode=TwoWay}"
+            />
+
+        <!-- Set defaults for background and border. -->
+        <Setter 
+            Property="Background" 
+            Value="Transparent" 
+            />
+        <Setter 
+            Property="BorderBrush" 
+            Value="Transparent" 
+            />
+        <Setter 
+            Property="BorderThickness" 
+            Value="1" 
+            />
+
+        <!-- The control-template for the node. -->
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate 
+                    TargetType="{x:Type NetworkUI:NodeItem}"
+                    >
+                    <Grid>
+
+                        <!-- 
+                        This border indicates that node is selected.
+                        Normally it is transparent, but when 'IsSelected' is set
+                        to 'true' the border brush becomes blue and its background
+                        becomes light blue.
+                        -->
+                        <Border
+                            x:Name="selectionBorder"
+                            Background="{TemplateBinding Background}" 
+                            BorderBrush="{TemplateBinding BorderBrush}" 
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            Margin="{TemplateBinding Margin}"
+                            Padding="{TemplateBinding Padding}"
+                            CornerRadius="8"
+                            >
+
+                            <!-- 
+                            User-defined node content is presented here. 
+                            -->
+                            <ContentPresenter />
+
+                        </Border>
+
+                    </Grid>
+                    <ControlTemplate.Triggers>
+
+                        <Trigger 
+                            Property="IsSelected"
+                            Value="True"
+                            >
+
+                            <!-- When the node is selected, set the color of 'selectionBorder' to blue. -->
+                            <Setter
+                                TargetName="selectionBorder"
+                                Property="BorderBrush"
+                                Value="{StaticResource selectionBorderColor}"
+                                />
+                        </Trigger>
+
+                        <Trigger 
+                            Property="IsSelected"
+                            Value="True"
+                            >
+
+                            <!-- When the node is selected, set the background of 'selectionBorder' to light blue. -->
+                            <Setter
+                                TargetName="selectionBorder"
+                                Property="Background"
+                                Value="{StaticResource selectionBorderBackgroundColor}"
+                                />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
         <Setter
             Property="X"
             Value="{Binding X}"
@@ -65,12 +130,11 @@
             />
     </Style>
 
+
     <!-- 
     A data-template that defines the UI for input connectors.
     -->
-    <DataTemplate
-        x:Key="inputConnectorTemplate"
-        >
+    <DataTemplate x:Key="inputConnectorTemplate" >
         <Grid
             Margin="0,2,0,0"
             >
@@ -94,6 +158,13 @@
                 Text="{Binding Name}"
                 VerticalAlignment="Center"
                 />
+
+            <Ellipse
+                    Visibility="{Binding IsConnectionAttached, Converter={StaticResource booleanToVisibilityConverter}}"
+                    Margin="3"
+                    Fill="{StaticResource connectionBrush}"
+                    IsHitTestVisible="False"
+                    />
         </Grid>
     </DataTemplate>
 
@@ -105,23 +176,33 @@
         >
         <Grid
             HorizontalAlignment="Right"
-            Margin="0,2,0,0"
+            Margin="5,2,5,0"
             >
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="*" />
-                <ColumnDefinition Width="Auto" />
-            </Grid.ColumnDefinitions>
+            <Grid.RowDefinitions>
+                <RowDefinition/>
+                <RowDefinition />
+                <RowDefinition Height="Auto" />
+            </Grid.RowDefinitions>
+
+            <TextBlock Grid.Row="0" HorizontalAlignment="Center" TextAlignment="Center" Text="{Binding Button.ButtonType, Converter={StaticResource ButtonSectionTypeSymbolConverter}}" FontFamily="{StaticResource MDL2Assets}" VerticalAlignment="Center" Margin="0,0,5,0">
+                <TextBlock.ToolTip>
+                    <TextBlock>
+                        <Run Text="{Binding Button.ButtonType}"/><Run Text=" Button"/>
+                    </TextBlock>
+                </TextBlock.ToolTip>
+            </TextBlock>
 
             <!-- The name of the connector. -->
             <TextBlock
-                Grid.Column="0"
-                Text="{Binding Name}"
+                Text="{Binding Button.Alias}"
+                FontStyle="Italic"
                 VerticalAlignment="Center"
-                Margin="0,0,5,0"
+                Margin="0,0,0,10"
+                Grid.Row="1"
                 />
 
             <Grid
-                Grid.Column="1"
+                Grid.Row="2"
                 Width="15"
                 Height="15"
                 Cursor="Hand"
@@ -134,7 +215,7 @@
                 <Ellipse
                     Visibility="{Binding IsConnectionAttached, Converter={StaticResource booleanToVisibilityConverter}}"
                     Margin="3"
-                    Fill="{StaticResource connectionBrush}"
+                    Fill="{Binding ParentNode.IsSelected, Converter={StaticResource SelectionToFillBrushConverter}}"
                     IsHitTestVisible="False"
                     />
             </Grid>
diff --git a/ANAConversationStudio/Tools/extract.bat b/ANAConversationStudio/Tools/extract.bat
index 13639bf..5f289bc 100644
--- a/ANAConversationStudio/Tools/extract.bat
+++ b/ANAConversationStudio/Tools/extract.bat
@@ -1,5 +1,17 @@
-@echo off
-cls
-timeout 5
-7za.exe x %1 -o%2 -aoa
-pause
\ No newline at end of file
+
+REM Update script
+@echo off
+@set /A excount=excount+1
+if %excount%==2 (
+	@echo Waiting for the studio to close
+	@timeout 5
+	@echo Installing latest version of the studio...
+	@7za.exe x %1 -o%2 -aoa
+	@echo Installing latest version of the simulator...
+	@powershell.exe -File %2\Simulator\Add-AppDevPackage.ps1
+	@pause
+) else (
+	@echo Updating installer..
+	@7za.exe e %1 -so Tools\extract.bat -aoa > extract_latest.bat
+	@call extract_latest %*
+)
\ No newline at end of file
diff --git a/ANAConversationStudio/UIHelpers/ActionCommand.cs b/ANAConversationStudio/UIHelpers/ActionCommand.cs
new file mode 100644
index 0000000..0f1348d
--- /dev/null
+++ b/ANAConversationStudio/UIHelpers/ActionCommand.cs
@@ -0,0 +1,29 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Input;
+
+namespace ANAConversationStudio.UIHelpers
+{
+    public class ActionCommand : ICommand
+    {
+        private Action<object> _action;
+        public ActionCommand(Action<object> action)
+        {
+            _action = action;
+        }
+        public event EventHandler CanExecuteChanged;
+
+        public bool CanExecute(object parameter)
+        {
+            return _action != null;
+        }
+
+        public void Execute(object parameter)
+        {
+            _action(parameter);
+        }
+    }
+}
diff --git a/ANAConversationStudio/UIHelpers/BindingProxy.cs b/ANAConversationStudio/UIHelpers/BindingProxy.cs
deleted file mode 100644
index 0a37e55..0000000
--- a/ANAConversationStudio/UIHelpers/BindingProxy.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Windows;
-
-namespace ANAConversationStudio.UIHelpers
-{
-    public class BindingProxy : Freezable
-    {
-        #region Overrides of Freezable
-
-        protected override Freezable CreateInstanceCore()
-        {
-            return new BindingProxy();
-        }
-
-        #endregion
-
-        public object Data
-        {
-            get { return (object)GetValue(DataProperty); }
-            set { SetValue(DataProperty, value); }
-        }
-
-        public static readonly DependencyProperty DataProperty =
-            DependencyProperty.Register("Data", typeof(object),
-                                         typeof(BindingProxy));
-    }
-}
diff --git a/ANAConversationStudio/UIHelpers/ButtonSectionTypeSymbolConverter.cs b/ANAConversationStudio/UIHelpers/ButtonSectionTypeSymbolConverter.cs
new file mode 100644
index 0000000..3512fef
--- /dev/null
+++ b/ANAConversationStudio/UIHelpers/ButtonSectionTypeSymbolConverter.cs
@@ -0,0 +1,106 @@
+using ANAConversationStudio.Models.Chat;
+using ANAConversationStudio.Models.Chat.Sections;
+using System;
+using System.Globalization;
+using System.Windows.Data;
+
+namespace ANAConversationStudio.UIHelpers
+{
+    public class ButtonSectionTypeSymbolConverter : IValueConverter
+    {
+        //Search the below as 'Segoe MDL2 Assets' in the internet to find how they look.
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            if (value is SectionTypeEnum secType)
+            {
+                switch (secType)
+                {
+                    case SectionTypeEnum.Image:
+                        return "\uEB9F";
+                    case SectionTypeEnum.Text:
+                        //return "\uE134"; //Comment quotations inside a chat bubble
+                        return "\uEC42"; //Text inside a chat bubble
+                    case SectionTypeEnum.Graph:
+                        break;
+                    case SectionTypeEnum.Gif:
+                        return "\uE913";
+                    case SectionTypeEnum.Audio:
+                        return "\uE8D6";
+                    case SectionTypeEnum.Video:
+                        return "\uE20A";
+                    case SectionTypeEnum.Link:
+                        break;
+                    case SectionTypeEnum.EmbeddedHtml:
+                        return "\uE12B";
+                    case SectionTypeEnum.Carousel:
+                        return "\uE89F";
+                    case SectionTypeEnum.PrintOTP:
+                        break;
+                    default:
+                        break;
+                }
+            }
+            if (value is ButtonTypeEnum buttonType)
+            {
+                switch (buttonType)
+                {
+                    case ButtonTypeEnum.PostText:
+                        break;
+                    case ButtonTypeEnum.OpenUrl:
+                        break;
+                    case ButtonTypeEnum.GetText:
+                        return "\uE13E";
+                    case ButtonTypeEnum.GetNumber:
+                        return "\uE18F";
+                    case ButtonTypeEnum.GetAddress:
+                        return "\uE779";
+                    case ButtonTypeEnum.GetEmail:
+                        return "\uE168";
+                    case ButtonTypeEnum.GetPhoneNumber:
+                        return "\uE13A";
+                    case ButtonTypeEnum.GetItemFromSource:
+                        return "\uE14C";
+                    case ButtonTypeEnum.GetImage:
+                        return "\uE156";
+                    case ButtonTypeEnum.GetAudio:
+                        return "\uE8D6";
+                    case ButtonTypeEnum.GetVideo:
+                        return "\uE20A";
+                    case ButtonTypeEnum.NextNode:
+                        return "\uEA54";
+                    case ButtonTypeEnum.DeepLink:
+                        break;
+                    case ButtonTypeEnum.GetAgent:
+                        return "\uE13D";
+                    case ButtonTypeEnum.ShowConfirmation:
+                        break;
+                    case ButtonTypeEnum.FetchChatFlow:
+                        return "\uE167";
+                    default:
+                        break;
+                }
+                return "\uEBFC"; //Default for buttons, 'Index Finger Clicking on Tab' symbol looks like a click action indicating a button
+            }
+            if (value is NodeTypeEnum nodeType)
+            {
+                switch (nodeType)
+                {
+                    case NodeTypeEnum.ApiCall:
+                        return "\uE943";
+                    case NodeTypeEnum.Combination:
+                        return "\uEC26"; //Group bubble icon
+                    case NodeTypeEnum.Card:
+                        return "\uE8AE";
+                    default:
+                        break;
+                }
+            }
+            return "\uE8F2";
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            return value;
+        }
+    }
+}
diff --git a/ANAConversationStudio/UIHelpers/EditSectionTemplateSelector.cs b/ANAConversationStudio/UIHelpers/EditSectionTemplateSelector.cs
new file mode 100644
index 0000000..339e206
--- /dev/null
+++ b/ANAConversationStudio/UIHelpers/EditSectionTemplateSelector.cs
@@ -0,0 +1,45 @@
+using ANAConversationStudio.Models.Chat;
+using ANAConversationStudio.Models.Chat.Sections;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+
+namespace ANAConversationStudio.UIHelpers
+{
+    public class EditSectionTemplateSelector : DataTemplateSelector
+    {
+        public override DataTemplate SelectTemplate(object item, DependencyObject container)
+        {
+            var templateName = "";
+            var section = item as Section;
+            switch (section.SectionType)
+            {
+                case SectionTypeEnum.Image:
+                case SectionTypeEnum.Gif:
+                case SectionTypeEnum.Audio:
+                case SectionTypeEnum.Video:
+                case SectionTypeEnum.EmbeddedHtml:
+                    templateName = "TitleCaptionUrlSectionEditTemplate";
+                    break;
+                case SectionTypeEnum.Text:
+                    templateName = "TextSectionEditTemplate";
+                    break;
+                case SectionTypeEnum.Carousel:
+                    templateName = "CarouselSectionEditTemplate";
+                    break;
+                case SectionTypeEnum.Graph:
+                case SectionTypeEnum.PrintOTP:
+                    templateName = "TextSectionEditTemplate";
+                    //Not supported yet.
+                    break;
+                default:
+                    break;
+            }
+            return Application.Current.Resources[templateName] as DataTemplate;
+        }
+    }
+}
diff --git a/ANAConversationStudio/UIHelpers/IsStartNodeToBrushConverter.cs b/ANAConversationStudio/UIHelpers/IsStartNodeToBrushConverter.cs
new file mode 100644
index 0000000..f019183
--- /dev/null
+++ b/ANAConversationStudio/UIHelpers/IsStartNodeToBrushConverter.cs
@@ -0,0 +1,26 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Windows;
+using System.Windows.Data;
+using System.Windows.Media;
+
+namespace ANAConversationStudio.UIHelpers
+{
+    public class IsStartNodeToBrushConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            var isStartNode = (bool)value;
+
+            return isStartNode ? Application.Current.Resources["startNodeBorderBrush"] : Application.Current.Resources["nodeBorderBrush"];
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            return value;
+        }
+    }
+}
diff --git a/ANAConversationStudio/UIHelpers/ObservableCollectionStringJoinConverter.cs b/ANAConversationStudio/UIHelpers/ObservableCollectionStringJoinConverter.cs
new file mode 100644
index 0000000..18c1c1f
--- /dev/null
+++ b/ANAConversationStudio/UIHelpers/ObservableCollectionStringJoinConverter.cs
@@ -0,0 +1,29 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Windows;
+using System.Windows.Data;
+
+namespace ANAConversationStudio.UIHelpers
+{
+    public class ObservableCollectionStringJoinConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            if (value is ObservableCollection<string> arrVal)
+                return string.Join(", ", arrVal);
+            return value;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            if (value is string sValue)
+                return new ObservableCollection<string>(sValue.Split(new[] { ",", "\n" }, StringSplitOptions.RemoveEmptyEntries).Select(x => x.Trim()));
+            return value;
+        }
+    }
+}
diff --git a/ANAConversationStudio/UIHelpers/SelectionToFillBrushConverter.cs b/ANAConversationStudio/UIHelpers/SelectionToFillBrushConverter.cs
new file mode 100644
index 0000000..d76eb7d
--- /dev/null
+++ b/ANAConversationStudio/UIHelpers/SelectionToFillBrushConverter.cs
@@ -0,0 +1,26 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Windows;
+using System.Windows.Data;
+using System.Windows.Media;
+
+namespace ANAConversationStudio.UIHelpers
+{
+    public class SelectionToFillBrushConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            var isSelected = (bool)value;
+
+            return isSelected ? Application.Current.Resources["connectionHighlightedBrush"] : Application.Current.Resources["connectionBrush"];
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            return value;
+        }
+    }
+}
diff --git a/ANAConversationStudio/UserControls/TableRowUserControl.xaml b/ANAConversationStudio/UserControls/TableRowUserControl.xaml
new file mode 100644
index 0000000..c16129b
--- /dev/null
+++ b/ANAConversationStudio/UserControls/TableRowUserControl.xaml
@@ -0,0 +1,18 @@
+<UserControl x:Class="ANAConversationStudio.UserControls.TableRowUserControl"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:ANAConversationStudio.UserControls"
+             mc:Ignorable="d" 
+             Name="Control"
+             d:DesignHeight="300" d:DesignWidth="300">
+    <Grid>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="{Binding LabelWidth, ElementName=Control}"/>
+            <ColumnDefinition/>
+        </Grid.ColumnDefinitions>
+        <TextBlock FontWeight="Bold" Text="{Binding Label, ElementName=Control}" Grid.Column="0" VerticalAlignment="Center"/>
+        <ContentControl Content="{Binding Field, ElementName=Control}" Grid.Column="1" VerticalAlignment="Center" VerticalContentAlignment="Center"/>
+    </Grid>
+</UserControl>
diff --git a/ANAConversationStudio/UserControls/TableRowUserControl.xaml.cs b/ANAConversationStudio/UserControls/TableRowUserControl.xaml.cs
new file mode 100644
index 0000000..d73e47e
--- /dev/null
+++ b/ANAConversationStudio/UserControls/TableRowUserControl.xaml.cs
@@ -0,0 +1,36 @@
+using System.Windows;
+using System.Windows.Controls;
+
+namespace ANAConversationStudio.UserControls
+{
+    public partial class TableRowUserControl : UserControl
+    {
+        public TableRowUserControl()
+        {
+            InitializeComponent();
+        }
+
+        public string Label
+        {
+            get { return (string)GetValue(LabelProperty); }
+            set { SetValue(LabelProperty, value); }
+        }
+
+        public static readonly DependencyProperty LabelProperty = DependencyProperty.Register("Label", typeof(string), typeof(TableRowUserControl), new PropertyMetadata());
+
+        public object Field
+        {
+            get { return (object)GetValue(FieldProperty); }
+            set { SetValue(FieldProperty, value); }
+        }
+
+        public static readonly DependencyProperty FieldProperty = DependencyProperty.Register("Field", typeof(object), typeof(TableRowUserControl), new PropertyMetadata());
+
+        public double LabelWidth
+        {
+            get { return (double)GetValue(LabelWidthProperty); }
+            set { SetValue(LabelWidthProperty, value); }
+        }
+        public static readonly DependencyProperty LabelWidthProperty = DependencyProperty.Register("LabelWidth", typeof(double), typeof(TableRowUserControl), new PropertyMetadata(120D));
+    }
+}
diff --git a/ANAConversationStudio/ViewModels/ConnectorViewModel.cs b/ANAConversationStudio/ViewModels/ConnectorViewModel.cs
index af3d3de..f0abb4e 100644
--- a/ANAConversationStudio/ViewModels/ConnectorViewModel.cs
+++ b/ANAConversationStudio/ViewModels/ConnectorViewModel.cs
@@ -7,6 +7,7 @@
 using System.Windows;
 using ANAConversationStudio.Models.Chat;
 using ANAConversationStudio.Models;
+using System.Windows.Media;
 
 namespace ANAConversationStudio.ViewModels
 {
diff --git a/ANAConversationStudio/ViewModels/MainWindowViewModel.cs b/ANAConversationStudio/ViewModels/MainWindowViewModel.cs
index 56b7ff9..25a32b0 100644
--- a/ANAConversationStudio/ViewModels/MainWindowViewModel.cs
+++ b/ANAConversationStudio/ViewModels/MainWindowViewModel.cs
@@ -9,6 +9,7 @@
 using ANAConversationStudio.Models.Chat;
 using ANAConversationStudio.Helpers;
 using System.ComponentModel;
+using System.Threading.Tasks;
 
 namespace ANAConversationStudio.ViewModels
 {
@@ -506,6 +507,11 @@ public void DeleteNode(NodeViewModel node, bool askConfirmation = true)
         #endregion
         public NodeViewModel CreateNode(ChatNode chatNode, Point nodeLocation)
         {
+            if (this.Network?.Nodes == null)
+            {
+                MessageBox.Show("Not connected to chat server or no project is loaded. If this is the first time, create a new project from file menu and get started. Please close the app and try again if the issue continues.");
+                return null;
+            }
             var node = new NodeViewModel(chatNode, nodeLocation);
             this.Network.Nodes.Add(node);
             return node;
@@ -537,21 +543,21 @@ public ChatNode SelectedChatNode
             }
         }
 
-        public void SaveNetworkLayout()
+        public async Task SaveLoadedChat()
         {
-            MongoHelper.Current.SaveNodeLocations(this.Network.Nodes.ToDictionary(x => x.ChatNode.Id, x => new Point(x.X, x.Y)));
+            StudioContext.Current.ChatFlow.NodeLocations = this.Network.Nodes.ToDictionary(x => x.ChatNode.Id, x => new LayoutPoint(x.X, x.Y));
+            StudioContext.Current.ChatFlow.ChatNodes = this.Network.Nodes.Select(x => x.ChatNode).ToList();
+            StudioContext.Current.ChatFlow.ChatContent = Utilities.ExtractContentFromChatNodes(StudioContext.Current.ChatFlow.ChatNodes);
+            await StudioContext.Current.SaveChatFlowAsync();
         }
-        public void SaveChatNodes()
-        {
-            MongoHelper.Current.SaveChatNodes(this.Network.Nodes.Select(x => x.ChatNode).ToList());
-        }
-        public bool LoadNodesFromDB()
+
+        public bool LoadNodes()
         {
             try
             {
-                if (MongoHelper.Current == null)
+                if (StudioContext.Current?.ChatFlow?.ChatNodes == null)
                 {
-                    MessageBox.Show("Database Connection is not yet selected.", "Oops!");
+                    MessageBox.Show("Connection with chat server is not established or no project is selected. If this is the first time, create a new project from file menu and get started. Please restart the application and try again if the issue continues.", "Oops!");
                     return false;
                 }
 
@@ -559,10 +565,10 @@ public bool LoadNodesFromDB()
                 this.Network.Connections.CollectionChanged += Connections_CollectionChanged;
 
                 var start = new Point(100, 60);
-                var allChatNodes = MongoHelper.Current.ChatNodes;
+                var allChatNodes = StudioContext.Current.ChatFlow.ChatNodes;
                 var uniqueChatNodes = allChatNodes.GroupBy(x => x.Id).SelectMany(x => x).OrderByDescending(x => x.IsStartNode).ToList();
 
-                var nodeVMs = uniqueChatNodes.Select(x => new NodeViewModel(x, MongoHelper.Current.GetPointForNode(x.Id) ?? new Point(start.X, start.Y += 100))).ToList(); //Dont remove .ToList()
+                var nodeVMs = uniqueChatNodes.Select(x => new NodeViewModel(x, StudioContext.Current.ChatFlow.NodeLocations.GetPointForNode(x.Id) ?? new Point(start.X, start.Y += 100))).ToList(); //Dont remove .ToList()
                 this.Network.Nodes.AddRange(nodeVMs); //Add all nodes before adding any connections  
 
                 foreach (var node in nodeVMs)
diff --git a/ANAConversationStudio/ViewModels/NodeViewModel.cs b/ANAConversationStudio/ViewModels/NodeViewModel.cs
index 1888f59..bbc75ad 100644
--- a/ANAConversationStudio/ViewModels/NodeViewModel.cs
+++ b/ANAConversationStudio/ViewModels/NodeViewModel.cs
@@ -358,7 +358,6 @@ public bool IsSelected
                 {
                     return;
                 }
-
                 isSelected = value;
 
                 OnPropertyChanged("IsSelected");
diff --git a/ANAConversationStudio/Views/ChatElementCollectionEditorWindow.xaml b/ANAConversationStudio/Views/ChatElementCollectionEditorWindow.xaml
deleted file mode 100644
index 6961d3d..0000000
--- a/ANAConversationStudio/Views/ChatElementCollectionEditorWindow.xaml
+++ /dev/null
@@ -1,18 +0,0 @@
-<Window x:Class="ANAConversationStudio.Views.ChatElementCollectionEditorWindow"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:Controls="clr-namespace:ANAConversationStudio.Controls"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:ANAConversationStudio.Views"
-        mc:Ignorable="d"
-        Height="400" Width="1366">
-    <Grid>
-        <Grid.ColumnDefinitions>
-            <ColumnDefinition />
-            <ColumnDefinition />
-        </Grid.ColumnDefinitions>
-        <ContentControl x:Name="ElementEditor"/>
-        <Controls:ChatContentCollectionControl x:Name="ChatElementContentCollectionEditor" Grid.Column="1" ParentChatNode="{Binding Path=Content.OwnerChatNode, ElementName=ElementEditor}" ChatContentOwner="{Binding ElementName=ElementEditor, Path=Content.SelectedItem, Mode=TwoWay, FallbackValue=null}"/>
-    </Grid>
-</Window>
diff --git a/ANAConversationStudio/Views/ChatElementCollectionEditorWindow.xaml.cs b/ANAConversationStudio/Views/ChatElementCollectionEditorWindow.xaml.cs
deleted file mode 100644
index cfeed6d..0000000
--- a/ANAConversationStudio/Views/ChatElementCollectionEditorWindow.xaml.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using System.Windows;
-using Xceed.Wpf.Toolkit;
-
-namespace ANAConversationStudio.Views
-{
-    /// <summary>
-    /// Interaction logic for ChatElementCollectionEditorWindow.xaml
-    /// </summary>
-    public partial class ChatElementCollectionEditorWindow : Window
-    {
-        public ChatElementCollectionEditorWindow()
-        {
-            InitializeComponent();
-        }
-
-        public ChatElementCollectionEditorWindow(CollectionControl control)
-        {
-            InitializeComponent();
-            if (control.ItemsSourceType.GenericTypeArguments != null && control.ItemsSourceType.GenericTypeArguments.Length > 0)
-                Title = $"Edit {control.ItemsSourceType.GenericTypeArguments[0].Name}";
-            else
-                Title = "Edit Element and its content";
-            ElementEditor.Content = control;
-        }
-    }
-}
diff --git a/ANAConversationStudio/Views/DBConnectionManager.xaml b/ANAConversationStudio/Views/ChatFlowsManagerWindow.xaml
similarity index 59%
rename from ANAConversationStudio/Views/DBConnectionManager.xaml
rename to ANAConversationStudio/Views/ChatFlowsManagerWindow.xaml
index ac01ac6..9ce4c0c 100644
--- a/ANAConversationStudio/Views/DBConnectionManager.xaml
+++ b/ANAConversationStudio/Views/ChatFlowsManagerWindow.xaml
@@ -1,12 +1,12 @@
-<Window x:Class="ANAConversationStudio.Views.DBConnectionManager"
+<Window x:Class="ANAConversationStudio.Views.ChatFlowsManagerWindow"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:ANAConversationStudio.Views"
         mc:Ignorable="d"
-        Title="Database Connection Manager (Mongo DB is supported currently)" Height="600" Width="800" WindowStyle="ToolWindow">
+        Closing="Window_Closing"
+        Title="Chat Flows Manager" Height="600" Width="800" WindowStyle="ToolWindow">
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition/>
@@ -14,17 +14,17 @@
             <RowDefinition Height="Auto"/>
         </Grid.RowDefinitions>
         <xctk:CollectionControl Margin="10" x:Name="CollectionControl"/>
-        <TextBlock Grid.Row="1" Text="Note: First connection will be the default connection and is loaded automatically. Use 'Up' and 'Down' arrows to re-order the connections." Margin="10,0"/>
+        <!--<TextBlock Grid.Row="1" Text="Note: First connection will be the default connection and is loaded automatically. Use 'Up' and 'Down' arrows to re-order the connections." Margin="10,0"/>-->
         <StackPanel Grid.Row="2" Margin="5" Orientation="Horizontal" HorizontalAlignment="Center">
             <StackPanel.Resources>
-                <Style TargetType="Button">
+                <Style TargetType="Button" BasedOn="{StaticResource {x:Type Button}}">
                     <Setter Property="Margin" Value="5"/>
                     <Setter Property="Padding" Value="5"/>
                     <Setter Property="MinWidth" Value="100"/>
                 </Style>
             </StackPanel.Resources>
-            <Button Content="Save and Close" Click="SaveClick"/>
-            <Button Content="Save and Connect" Click="SaveAndConnectClick" IsEnabled="{Binding ElementName=CollectionControl, Path=SelectedItem, Converter={StaticResource N2B}}"/>
+            <Button Content="Save" Click="SaveClick"/>
+            <Button Content="Save and load selected" Click="SaveAndConnectClick" IsEnabled="{Binding ElementName=CollectionControl, Path=SelectedItem, Converter={StaticResource N2B}}"/>
             <Button Content="Cancel" Click="CancelClick"/>
         </StackPanel>
     </Grid>
diff --git a/ANAConversationStudio/Views/ChatFlowsManagerWindow.xaml.cs b/ANAConversationStudio/Views/ChatFlowsManagerWindow.xaml.cs
new file mode 100644
index 0000000..de40968
--- /dev/null
+++ b/ANAConversationStudio/Views/ChatFlowsManagerWindow.xaml.cs
@@ -0,0 +1,115 @@
+using ANAConversationStudio.Helpers;
+using ANAConversationStudio.Models.Chat;
+using MongoDB.Bson;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.ComponentModel;
+using System.Linq;
+using System.Threading.Tasks;
+using System.Windows;
+
+namespace ANAConversationStudio.Views
+{
+    public partial class ChatFlowsManagerWindow : Window
+    {
+        public ChatFlowsManagerWindow()
+        {
+            InitializeComponent();
+
+            CollectionControl.ItemsSource = StudioContext.Current.ChatFlowProjects.DeepCopy();
+            CollectionControl.ItemsSourceType = typeof(ObservableCollection<ANAProject>);
+            CollectionControl.NewItemTypes = new List<Type>() { typeof(ANAProject) };
+            CollectionControl.ItemAdding += CollectionControl_ItemAdding;
+            CollectionControl.ItemDeleting += CollectionControl_ItemDeleting;
+        }
+
+        private void CollectionControl_ItemDeleting(object sender, Xceed.Wpf.Toolkit.ItemDeletingEventArgs e)
+        {
+            e.Cancel = true;
+            MessageBox.Show("You do not have the access to delete a chat flow", "Access Denied");
+        }
+
+        private void CollectionControl_ItemAdding(object sender, Xceed.Wpf.Toolkit.ItemAddingEventArgs e)
+        {
+            if (e.Item is ANAProject aProj && string.IsNullOrWhiteSpace(aProj._id))
+                aProj._id = ObjectId.GenerateNewId().ToString();
+        }
+
+        private async void Window_Closing(object sender, CancelEventArgs e)
+        {
+            if (HideConfirm) return;
+
+            var op = MessageBox.Show("Save changes?", "Hold on!", MessageBoxButton.YesNoCancel);
+            if (op == MessageBoxResult.Cancel)
+            {
+                e.Cancel = true;
+                return;
+            }
+            if (op == MessageBoxResult.Yes)
+            {
+                await SaveAsync();
+                Application.Current.Shutdown();
+            }
+        }
+        private bool HideConfirm = false;
+
+        private async Task<bool> SaveAsync()
+        {
+            var conns = CollectionControl.Items.Cast<ANAProject>().ToList();
+
+            if (conns.Any(x => !x.IsValid()))
+            {
+                MessageBox.Show("The following chat flows are invalid, please correct them: \r\n" + string.Join("\r\n", conns.Where(x => !x.IsValid())), "Oops!");
+                return false;
+            }
+            StudioContext.Current.ChatFlowProjects = conns;
+            await StudioContext.Current.SaveProjectsAsync();
+            CollectionControl.Items.Clear();
+            CollectionControl.ItemsSource = StudioContext.Current.ChatFlowProjects.DeepCopy();
+            MainWindow.Current?.LoadFileMenuSavedConnections();
+            return true;
+        }
+
+        private async void SaveClick(object sender, RoutedEventArgs e)
+        {
+            if (await SaveAsync())
+            {
+                HideConfirm = true;
+                Close();
+            }
+        }
+
+        private void CancelClick(object sender, RoutedEventArgs e)
+        {
+            HideConfirm = true;
+            Close();
+        }
+
+        private async void SaveAndConnectClick(object sender, RoutedEventArgs e)
+        {
+            var conn = (CollectionControl.SelectedItem as ANAProject);
+            if (conn != null)
+            {
+                try
+                {
+                    if (!conn.IsValid())
+                    {
+                        MessageBox.Show("The chat flow details are invalid. Please correct them and try again.", "Oops!");
+                        return;
+                    }
+                    if (await SaveAsync())
+                    {
+                        await MainWindow.Current.LoadProjectAsync(conn);
+                        HideConfirm = true;
+                        Close();
+                    }
+                }
+                catch (Exception ex)
+                {
+                    MessageBox.Show("Unable to load the selected chat flow project.");
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/ANAConversationStudio/Views/DBConnectionManager.xaml.cs b/ANAConversationStudio/Views/DBConnectionManager.xaml.cs
deleted file mode 100644
index fe9e89b..0000000
--- a/ANAConversationStudio/Views/DBConnectionManager.xaml.cs
+++ /dev/null
@@ -1,132 +0,0 @@
-using MongoDB.Bson;
-using ANAConversationStudio.Helpers;
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Shapes;
-
-namespace ANAConversationStudio.Views
-{
-    /// <summary>
-    /// Interaction logic for DBConnectionManager.xaml
-    /// </summary>
-    public partial class DBConnectionManager : Window
-    {
-        public DBConnectionManager(List<DatabaseConnection> databaseConnections)
-        {
-            InitializeComponent();
-            this.Closing += DBConnectionManager_Closing;
-            CollectionControl.ItemsSource = databaseConnections.DeepCopy();
-            CollectionControl.ItemsSourceType = typeof(ObservableCollection<DatabaseConnection>);
-            CollectionControl.NewItemTypes = new List<Type>() { typeof(DatabaseConnection) };
-        }
-
-        private void DBConnectionManager_Closing(object sender, System.ComponentModel.CancelEventArgs e)
-        {
-            if (HideConfirm) return;
-            if (!hasChanges()) return;
-            var op = MessageBox.Show("Save changes?", "Hold on!", MessageBoxButton.YesNoCancel);
-            if (op == MessageBoxResult.Cancel)
-            {
-                e.Cancel = true;
-                return;
-            }
-            if (op == MessageBoxResult.Yes)
-            {
-                Save();
-            }
-        }
-        private bool HideConfirm = false;
-        private void ConnectToSelectedClick(object sender, RoutedEventArgs e)
-        {
-            if (CollectionControl.SelectedItem as DatabaseConnection != null)
-            {
-                MongoHelper.Current = new MongoHelper(CollectionControl.SelectedItem as DatabaseConnection);
-                MainWindow.Current.ViewModel.LoadNodesFromDB();
-                MainWindow.Current.Status("Loaded");
-                HideConfirm = true;
-                Close();
-            }
-        }
-
-        private bool hasChanges()
-        {
-            //var conns = CollectionControl.Items.Cast<DatabaseConnection>().ToList();
-            //return Utilities.Settings.SavedConnections.ToJson() != conns.ToJson();
-            return true;
-        }
-
-        private bool Save()
-        {
-            var conns = CollectionControl.Items.Cast<DatabaseConnection>().ToList();
-
-            if (hasChanges())
-            {
-                if (conns.Any(x => !x.IsValid()))
-                {
-                    MessageBox.Show("The following connections are invalid, please correct them: \r\n" + string.Join("\r\n", conns.Where(x => !x.IsValid())), "Oops!");
-                    return false;
-                }
-                Utilities.Settings.SavedConnections = conns;
-                Utilities.Settings.Save(App.Cryptio);
-            }
-            return true;
-        }
-
-        private void SaveClick(object sender, RoutedEventArgs e)
-        {
-            if (Save())
-            {
-                HideConfirm = true;
-                Close();
-            }
-        }
-
-        private void CancelClick(object sender, RoutedEventArgs e)
-        {
-            HideConfirm = true;
-            Close();
-        }
-
-        private void SaveAndConnectClick(object sender, RoutedEventArgs e)
-        {
-            if (CollectionControl.SelectedItem as DatabaseConnection != null)
-            {
-                try
-                {
-                    if (!(CollectionControl.SelectedItem as DatabaseConnection).IsValid())
-                    {
-                        MessageBox.Show("The connection details are invalid. Please correct them and try again.", "Oops!");
-                        return;
-                    }
-                    MongoHelper.Current = new MongoHelper(CollectionControl.SelectedItem as DatabaseConnection);
-                    var connected = MainWindow.Current.ViewModel.LoadNodesFromDB();
-                    if (connected)
-                    {
-                        MainWindow.Current.Status("Chat flow loaded");
-                        if (Save())
-                        {
-                            HideConfirm = true;
-                            Close();
-                        }
-                    }
-                }
-                catch (Exception ex)
-                {
-                    MongoHelper.Current = null;
-                    MainWindow.Current.Status("Unable to connect to the database");
-                }
-            }
-        }
-    }
-}
diff --git a/ANAConversationStudio/Views/EnterPassword.xaml b/ANAConversationStudio/Views/EnterPassword.xaml
index 638d497..f712a87 100644
--- a/ANAConversationStudio/Views/EnterPassword.xaml
+++ b/ANAConversationStudio/Views/EnterPassword.xaml
@@ -6,7 +6,7 @@
         xmlns:local="clr-namespace:ANAConversationStudio.Views"
         mc:Ignorable="d"
         Closing="Window_Closing"
-        Title="ANA Conversation Studio" Height="300" Width="300" Icon="/ANAConversationStudio;component/favicon.ico" WindowStartupLocation="CenterScreen">
+        Title="ANA Conversation Studio" Height="300" Width="400" Icon="/ANAConversationStudio;component/favicon.ico" WindowStartupLocation="CenterScreen">
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition/>
@@ -17,6 +17,6 @@
         <TextBlock Text="Enter the password" Name="LabelTextBlock" TextAlignment="Center" VerticalAlignment="Center" FontSize="30" Margin="10"/>
         <PasswordBox Name="PwdBox" Grid.Row="1" VerticalAlignment="Center" FontSize="30" Margin="10" KeyDown="PwdBox_KeyDown"/>
         <Button Content="Submit" Grid.Row="2" Padding="30,5" Margin="5" HorizontalAlignment="Center" Click="SubmitClick"/>
-        <TextBlock FontStyle="Italic" Grid.Row="3" Margin="10" Text="If you have forgot the password, delete 'Settings.json' file (which will delete your saved connections and other details) and restart the studio to set a new password." TextWrapping="Wrap"/>
+        <TextBlock FontStyle="Italic" Grid.Row="3" Margin="10" Text="If you have forgotten the password, delete 'Settings.json' file (which will delete your saved chat servers and other details) and restart the studio to set a new password." TextWrapping="Wrap"/>
     </Grid>
 </Window>
diff --git a/ANAConversationStudio/Views/EnterPassword.xaml.cs b/ANAConversationStudio/Views/EnterPassword.xaml.cs
index 1d566fc..aac75af 100644
--- a/ANAConversationStudio/Views/EnterPassword.xaml.cs
+++ b/ANAConversationStudio/Views/EnterPassword.xaml.cs
@@ -1,4 +1,5 @@
 using ANAConversationStudio.Helpers;
+using System.Diagnostics;
 using System.Windows;
 
 namespace ANAConversationStudio.Views
diff --git a/ANAConversationStudio/Views/MainWindow.xaml b/ANAConversationStudio/Views/MainWindow.xaml
index 5f04842..d551e0a 100644
--- a/ANAConversationStudio/Views/MainWindow.xaml
+++ b/ANAConversationStudio/Views/MainWindow.xaml
@@ -1,17 +1,12 @@
 <Window x:Class="ANAConversationStudio.Views.MainWindow"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="clr-namespace:ANAConversationStudio"
     xmlns:VM="clr-namespace:ANAConversationStudio.ViewModels"
     xmlns:Controls="clr-namespace:ANAConversationStudio.Controls"
     xmlns:NetworkUI="clr-namespace:NetworkUI;assembly=NetworkUI"
-    xmlns:NetworkModel="clr-namespace:ANAConversationStudio.Models"
     xmlns:UI="clr-namespace:ANAConversationStudio.UIHelpers"
     xmlns:ZoomAndPan="clr-namespace:ZoomAndPan;assembly=ZoomAndPan"
     xmlns:ac="clr-namespace:AdornedControl;assembly=AdornedControl"
-    xmlns:avalonDock="http://schemas.xceed.com/wpf/xaml/avalondock"
-    xmlns:diagnostics="clr-namespace:System.Diagnostics;assembly=WindowsBase"
-    xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
     Title="ANA Conversation Studio" 
     x:Name="mainWindow"
     MinWidth="400"
@@ -35,10 +30,7 @@
                 <!-- 
                 Merge in the resource dictionary that is shared between the main window and the overview window.
                 -->
-                <ResourceDictionary 
-                    Source="/Styles/SharedVisualTemplates.xaml"
-                    />
-
+                <ResourceDictionary Source="/Styles/SharedVisualTemplates.xaml" />
             </ResourceDictionary.MergedDictionaries>
 
             <!-- UI commands. -->
@@ -57,6 +49,7 @@
             <RoutedUICommand x:Key="Commands.Save" />
             <RoutedUICommand x:Key="Commands.PrevNode" />
             <RoutedUICommand x:Key="Commands.NextNode" />
+            <RoutedUICommand x:Key="Commands.StartInSimulator" />
 
             <!-- 
             This converts from a scale value to a percentage value.
@@ -152,7 +145,7 @@
                             CenterY="10"
                             />
                     </Grid.RenderTransform>
-                    <Ellipse
+                    <!--<Ellipse
                         x:Name="shadow"
                         VerticalAlignment="Stretch"
                         HorizontalAlignment="Stretch"
@@ -164,18 +157,17 @@
                                 Y="1.5"
                                 />
                         </Ellipse.RenderTransform>
-                    </Ellipse>
-                    <Ellipse
+                    </Ellipse>-->
+                    <!--<Ellipse
                         x:Name="ellipse"
                         Stroke="Black"
                         VerticalAlignment="Stretch"
                         HorizontalAlignment="Stretch"
                         Fill="White"
-                        />
-                    <Image
-                        Source="/Resources/scissors.png" 
-                        Margin="2"
-                        />
+                        />-->
+                    <Border CornerRadius="100" Background="{StaticResource nodeHeaderBorderBrush}" Cursor="Hand">
+                        <TextBlock Text="&#xE10A;" Foreground="White" FontFamily="Segoe UI Symbol" HorizontalAlignment="Center" VerticalAlignment="Center" TextAlignment="Center" FontWeight="Light"/>
+                    </Border>
                 </Grid>
                 <ControlTemplate.Triggers>
                     <EventTrigger
@@ -256,9 +248,9 @@
 
                     <!-- The connection is represented by a curved arrow. -->
                     <Controls:CurvedArrow
-                        Stroke="{StaticResource connectionBrush}"
+                        Stroke="{Binding SourceConnector.ParentNode.IsSelected, Converter={StaticResource SelectionToFillBrushConverter}}"
                         StrokeThickness="2"
-                        Fill="{StaticResource connectionBrush}"
+                        Fill="{Binding SourceConnector.ParentNode.IsSelected, Converter={StaticResource SelectionToFillBrushConverter}}"
                         Points="{Binding Points}"
                         />
 
@@ -280,7 +272,7 @@
                                 Y1="30"
                                 X2="15"
                                 Y2="15"
-                                Stroke="Black"
+                                Stroke="{StaticResource nodeHeaderBorderBrush}"
                                 StrokeThickness="1"
                                 />
                             <Button
@@ -315,34 +307,37 @@
                     VerticalAdornerPlacement="Outside"
                     AdornerOffsetX="-12"
                     AdornerOffsetY="8"
+                    Background="Transparent"
                     IsMouseOverShowEnabled="{Binding ElementName=networkControl, Path=IsNotDragging}"
                     >
 
                     <!-- The margin has been selected so that the selection rect nicely covers the entire node. -->
 
-                    <Grid
+                    <Border
                         MinWidth="120"
                         Margin="10,6,10,6"
                         SizeChanged="Node_SizeChanged"
+                        Background="{StaticResource nodeFillBrush}"
+                        BorderThickness="1.3"
+                        BorderBrush="{Binding ChatNode.IsStartNode, Converter={StaticResource IsStartNodeToBrushConverter}}"
+                        CornerRadius="10"
                         >
 
                         <!-- This rectangle is the main visual for the node. -->
 
-                        <Rectangle
+                        <!--<Rectangle
                             Stroke="{StaticResource nodeBorderBrush}"
                             StrokeThickness="1.3"
                             RadiusX="4"
                             RadiusY="4"
                             Fill="{StaticResource nodeFillBrush}"
-                            />
+                            />-->
 
                         <!-- 
                         This grid contains the node's connectors.
                         The margin is negative so that the connectors overlap the body of the node and it's selection border.
                         -->
-                        <Grid
-                            Margin="-6,4,-6,4"
-                            >
+                        <Grid Margin="-6,0,-6,-18">
                             <Grid.ColumnDefinitions>
                                 <ColumnDefinition Width="Auto" />
                                 <ColumnDefinition Width="*" MinWidth="10" />
@@ -353,37 +348,98 @@
                                 <!-- spacer -->
                                 <RowDefinition Height="2" />
                                 <RowDefinition Height="Auto" />
+                                <RowDefinition Height="Auto" />
                             </Grid.RowDefinitions>
 
-                            <!-- The name of the node. -->
-                            <TextBlock
+                            <Border 
+                                CornerRadius="8"
+                                Margin="6,0,6,0"
+                                Background="{StaticResource nodeHeaderBorderBrush}"
                                 Grid.Column="0"
                                 Grid.ColumnSpan="3"
-                                Grid.Row="0"
-                                Text="{Binding Name}"
-                                HorizontalAlignment="Center"
-                                VerticalAlignment="Center"
-                                />
+                                Grid.Row="0">
+                                <!-- The name of the node. -->
+                                <Grid>
+                                    <Grid Height="18" Background="{StaticResource nodeHeaderBorderBrush}" VerticalAlignment="Bottom"/>
+                                    <StackPanel
+                                        Orientation="Horizontal"
+                                        HorizontalAlignment="Center"
+                                        VerticalAlignment="Center"
+                                        Margin="10,5,10,3">
+                                        <TextBlock Margin="3" Foreground="White" Text="{Binding ChatNode.NodeType, Converter={StaticResource ButtonSectionTypeSymbolConverter}}" FontFamily="{StaticResource MDL2Assets}" VerticalAlignment="Center">
+                                            <TextBlock.ToolTip>
+                                                <TextBlock >
+                                                    <Run Text="{Binding ChatNode.NodeType}"/><Run Text=" Node"/>
+                                                </TextBlock>
+                                            </TextBlock.ToolTip>
+                                        </TextBlock>
+                                        <TextBlock Text="{Binding ChatNode.Alias}" Foreground="White" Margin="3" VerticalAlignment="Center"/>
+                                    </StackPanel>
+                                </Grid>
+                            </Border>
 
                             <!-- Displays the node's input connectors. -->
                             <ItemsControl
-                                Grid.Column="0"
-                                Grid.Row="2"
+                                HorizontalAlignment="Center"
+                                Opacity="1"
+                                Grid.Row="0"
+                                Margin="0,-10,0,0"
+                                Grid.ColumnSpan="3"
                                 ItemsSource="{Binding InputConnectors}"
                                 ItemTemplate="{StaticResource inputConnectorTemplate}"
                                 Focusable="False"
                                 />
 
+                            <ItemsControl Margin="30,10" HorizontalAlignment="Stretch" ItemsSource="{Binding ChatNode.Sections}" Grid.Row="2" HorizontalContentAlignment="Stretch" Grid.Column="1">
+                                <ItemsControl.ItemTemplate>
+                                    <DataTemplate>
+                                        <Border BorderBrush="White" BorderThickness="0,0,0,0" HorizontalAlignment="Stretch" Padding="0,5,0,5">
+                                            <Grid>
+                                                <Grid.ColumnDefinitions>
+                                                    <ColumnDefinition Width="Auto"/>
+                                                    <ColumnDefinition/>
+                                                </Grid.ColumnDefinitions>
+                                                <Grid.RowDefinitions>
+                                                    <RowDefinition/>
+                                                    <RowDefinition Height="Auto"/>
+                                                </Grid.RowDefinitions>
+                                                <TextBlock Grid.Row="0" Text="{Binding SectionType, Converter={StaticResource ButtonSectionTypeSymbolConverter}}" FontFamily="{StaticResource MDL2Assets}" VerticalAlignment="Center" Margin="0,0,5,0" >
+                                                    <TextBlock.ToolTip>
+                                                        <TextBlock>
+                                                            <Run Text="{Binding SectionType}"/><Run Text=" Section"/>
+                                                        </TextBlock>
+                                                    </TextBlock.ToolTip>
+                                                </TextBlock>
+                                                <TextBlock Grid.Row="0" Grid.Column="1" Text="{Binding Alias}" MaxWidth="250" TextWrapping="Wrap" Margin="0,0,5,0" ToolTip="{Binding Text}"/>
+                                                <Border CornerRadius="2" BorderBrush="White" Grid.ColumnSpan="2" Margin="0,5,0,0" BorderThickness="0,0.2" HorizontalAlignment="Stretch" Grid.Row="1"/>
+                                            </Grid>
+                                        </Border>
+                                    </DataTemplate>
+                                </ItemsControl.ItemTemplate>
+                            </ItemsControl>
+
+                            <!--<TextBox Text="&#xE26E;" FontFamily="Segoe UI Symbol"/>-->
+
                             <!-- Displays the node's output connectors. -->
                             <ItemsControl
-                                Grid.Column="2"
-                                Grid.Row="2"
+                                HorizontalAlignment="Center"
+                                VerticalAlignment="Bottom"
+                                Margin="10,0,10,10"
+                                Grid.Row="3"
+                                Grid.Column="0"
+                                Grid.ColumnSpan="5"
                                 ItemsSource="{Binding OutputConnectors}"
                                 ItemTemplate="{StaticResource outputConnectorTemplate}"
                                 Focusable="False"
-                                />
+                                >
+                                <ItemsControl.ItemsPanel>
+                                    <ItemsPanelTemplate>
+                                        <StackPanel Orientation="Horizontal"/>
+                                    </ItemsPanelTemplate>
+                                </ItemsControl.ItemsPanel>
+                            </ItemsControl>
                         </Grid>
-                    </Grid>
+                    </Border>
 
                     <ac:AdornedControl.AdornerContent>
 
@@ -403,7 +459,7 @@
                                 Y1="30"
                                 X2="15"
                                 Y2="15"
-                                Stroke="Black"
+                                Stroke="{StaticResource nodeHeaderBorderBrush}"
                                 StrokeThickness="1"
                                 />
                             <Button
@@ -422,33 +478,37 @@
                     </ac:AdornedControl.AdornerContent>
                 </ac:AdornedControl>
             </DataTemplate>
-
+            <Style TargetType="Menu" BasedOn="{StaticResource {x:Type Menu}}">
+                <Setter Property="Padding" Value="0"/>
+            </Style>
         </ResourceDictionary>
 
     </Window.Resources>
 
     <Window.InputBindings>
-
         <!-- Bind input to commands. -->
-
         <KeyBinding
 			Key="Del"
 			Command="{StaticResource Commands.DeleteSelectedNodes}"
 			/>
         <KeyBinding
 			Key="Minus"
+            Modifiers="Ctrl"
 			Command="{StaticResource Commands.ZoomOut}"
 			/>
         <KeyBinding
 			Key="Plus"
+            Modifiers="Ctrl"
 			Command="{StaticResource Commands.ZoomIn}"
 			/>
         <KeyBinding
 			Key="Backspace"
+            Modifiers="Ctrl"
 			Command="{StaticResource Commands.JumpBackToPrevZoom}"
 			/>
         <KeyBinding
 			Key="Space"
+            Modifiers="Ctrl"
 			Command="{StaticResource Commands.FitContent}"
 			/>
         <KeyBinding
@@ -471,6 +531,10 @@
             Modifiers="Ctrl"
 			Command="{StaticResource Commands.NextNode}"
 			/>
+        <KeyBinding
+			Key="F5"
+			Command="{StaticResource Commands.StartInSimulator}"
+			/>
     </Window.InputBindings>
 
     <Window.CommandBindings>
@@ -534,14 +598,14 @@
             Command="{StaticResource Commands.PrevNode}" 
             Executed="PrevNode_Executed" 
             />
+        <CommandBinding 
+            Command="{StaticResource Commands.StartInSimulator}" 
+            Executed="StartInSimulator_Executed" 
+            />
     </Window.CommandBindings>
 
     <Window.ContextMenu>
-
         <ContextMenu>
-
-            <!-- Clicking this menu item creates a new node. -->
-
             <MenuItem
                 Header="Create Node"
                 Command="{StaticResource Commands.CreateNode}"
@@ -596,156 +660,159 @@
             <RowDefinition/>
             <RowDefinition Height="Auto"/>
         </Grid.RowDefinitions>
-        <Menu Grid.Row="0" x:Name="menu" HorizontalAlignment="Stretch" VerticalAlignment="Top" >
-            <MenuItem Header="File" x:Name="FileMenu">
-                <MenuItem Header="Open Saved" HorizontalContentAlignment="Left" x:Name="SavedConnectionsFileMenu">
+        <Menu BorderBrush="{StaticResource PrimaryHueLightBrush}" Foreground="{StaticResource FileMenuForegroundBrush}" BorderThickness="0,0,0,1" Grid.Row="0" x:Name="menu" HorizontalAlignment="Stretch" VerticalAlignment="Top" >
+            <MenuItem Header="File" x:Name="FileMenu" Height="30">
+                <MenuItem Header="New Chat Flow" Click="NewChatFlowClick"/>
+                <MenuItem Header="Open Chat Flow" HorizontalContentAlignment="Left" x:Name="SavedConnectionsFileMenu">
                     <MenuItem.ItemTemplate>
                         <DataTemplate>
                             <MenuItem Header="{Binding}" HorizontalContentAlignment="Left" HorizontalAlignment="Left" Tag="{Binding}" Click="SavedConnectionClick"/>
                         </DataTemplate>
                     </MenuItem.ItemTemplate>
                 </MenuItem>
-                <MenuItem Header="Manage Connections" Click="ManageConnectionClick"/>
+                <MenuItem Header="Manage Chat Flows" Click="ManageChatFlowsClick"/>
                 <MenuItem Header="Settings" Click="SettingsClick"/>
                 <MenuItem Header="Exit" Click="ExitClick"/>
             </MenuItem>
-            <MenuItem Header="Tools">
+            <MenuItem Header="Tools" Height="30">
                 <MenuItem Header="Launch Simulator" Click="ConvSimMenuClick"/>
+                <MenuItem Header="Launch Current Chat in Simulator (F5)" Click="ConvSimWithChatMenuClick"/>
+
             </MenuItem>
-            <MenuItem Header="Help" Name="HelpMenu">
-                <MenuItem Header="No update available!" Click="UpdateMenuClick" IsEnabled="False" Name="UpdateMenuItem"/>
+            <MenuItem Header="Help" Name="HelpMenu" Height="30">
+                <MenuItem Header="No Update Available!" Click="UpdateMenuClick" IsEnabled="False" Name="UpdateMenuItem"/>
             </MenuItem>
         </Menu>
-        <avalonDock:DockingManager Grid.Row="1" x:Name="dockingManager" >
-            <avalonDock:LayoutRoot>
-                <avalonDock:LayoutPanel>
-                    <avalonDock:LayoutDocumentPane>
-                        <avalonDock:LayoutDocument ContentId="NodeNetworkView" Title=" Chat Flow " CanClose="False" CanFloat="False">
-                            <DockPanel>
+        <DockPanel Grid.Row="1" >
 
-                                <!-- Grid placed below the zoom and pan control that contains the zoom slider, zoom label and some buttons. -->
+            <!-- Grid placed below the zoom and pan control that contains the zoom slider, zoom label and some buttons. -->
 
-                                <Grid
+            <Grid
             Margin="5,5,5,5"
             DockPanel.Dock="Bottom"
             >
-                                    <Grid.ColumnDefinitions>
+                <Grid.Resources>
+                    <Style TargetType="Button" BasedOn="{StaticResource {x:Type Button}}">
+                        <Setter Property="Padding" Value="0"/>
+                    </Style>
+                </Grid.Resources>
+                <Grid.ColumnDefinitions>
 
-                                        <!-- empty space -->
-                                        <ColumnDefinition Width="75" />
-                                        <ColumnDefinition/>
-                                        <ColumnDefinition Width="Auto"/>
-                                        <ColumnDefinition Width="5"/>
+                    <!-- empty space -->
+                    <ColumnDefinition Width="75" />
+                    <ColumnDefinition/>
+                    <ColumnDefinition Width="Auto"/>
+                    <ColumnDefinition Width="5"/>
 
-                                        <!-- the fit content button -->
-                                        <ColumnDefinition Width="40" />
+                    <!-- the fit content button -->
+                    <ColumnDefinition Width="40" />
 
-                                        <!-- spacer -->
-                                        <ColumnDefinition Width="5" />
+                    <!-- spacer -->
+                    <ColumnDefinition Width="5" />
 
-                                        <!-- the fill button -->
-                                        <ColumnDefinition Width="40" />
+                    <!-- the fill button -->
+                    <ColumnDefinition Width="40" />
 
-                                        <!-- spacer -->
-                                        <ColumnDefinition Width="5" />
+                    <!-- spacer -->
+                    <ColumnDefinition Width="5" />
 
-                                        <!-- the 100% button -->
-                                        <ColumnDefinition Width="40" />
+                    <!-- the 100% button -->
+                    <ColumnDefinition Width="40" />
 
-                                        <!-- spacer -->
-                                        <ColumnDefinition Width="5" />
+                    <!-- spacer -->
+                    <ColumnDefinition Width="5" />
 
-                                        <!-- the zoom percentage label -->
-                                        <ColumnDefinition Width="25" />
+                    <!-- the zoom percentage label -->
+                    <ColumnDefinition Width="25" />
 
-                                        <!-- the % symbol -->
-                                        <ColumnDefinition Width="15" />
+                    <!-- the % symbol -->
+                    <ColumnDefinition Width="15" />
 
-                                        <!-- spacer -->
-                                        <ColumnDefinition Width="5" />
+                    <!-- spacer -->
+                    <ColumnDefinition Width="5" />
 
-                                        <!-- the zoom out button -->
-                                        <ColumnDefinition Width="20" />
+                    <!-- the zoom out button -->
+                    <ColumnDefinition Width="20" />
 
-                                        <!-- spacer -->
-                                        <ColumnDefinition Width="5" />
+                    <!-- spacer -->
+                    <ColumnDefinition Width="5" />
 
-                                        <!-- the zoom slider -->
-                                        <ColumnDefinition Width="120" />
+                    <!-- the zoom slider -->
+                    <ColumnDefinition Width="120" />
 
-                                        <!-- spacer -->
-                                        <ColumnDefinition Width="5" />
+                    <!-- spacer -->
+                    <ColumnDefinition Width="5" />
 
-                                        <!-- the zoom in button -->
-                                        <ColumnDefinition Width="20" />
+                    <!-- the zoom in button -->
+                    <ColumnDefinition Width="20" />
 
-                                        <!-- spacer -->
-                                        <ColumnDefinition Width="10" />
+                    <!-- spacer -->
+                    <ColumnDefinition Width="10" />
 
-                                        <!-- resize grip -->
-                                        <ColumnDefinition Width="Auto" />
+                    <!-- resize grip -->
+                    <ColumnDefinition Width="Auto" />
 
-                                    </Grid.ColumnDefinitions>
-                                    <Button Grid.Column="0" Click="SaveButtonClick" ToolTip="Save changes (Ctrl+S)" Content="Save"/>
-                                    <TextBlock x:Name="StatusTextBlock" Text="" VerticalAlignment="Center" Margin="5,4" Grid.Column="1" />
-                                    <Button Grid.Column="2" Content="Clone Node" Padding="5,0" Click="CloneSelectedNodeClick" ToolTip="Create a deep copy of the node along with content (Alt+C)"/>
-                                    <!-- 
+                </Grid.ColumnDefinitions>
+                <Button Grid.Column="0" Click="SaveButtonClick" ToolTip="Save changes (Ctrl+S)" Content="Save"/>
+                <TextBlock x:Name="StatusTextBlock" Text="" VerticalAlignment="Center" Margin="5,4" Grid.Column="1" />
+                <Button Grid.Column="2" Content="Clone Node" Padding="5,0" Click="CloneSelectedNodeClick" ToolTip="Create a deep copy of the node along with content (Alt+C)"/>
+                <!-- 
             The 'fit content' button.  Causes the content to be scaled so that all the graph nodes fit in the viewport.
             -->
-                                    <Button
+                <Button
                 Grid.Column="4"
                 Command="{StaticResource Commands.FitContent}"
                 ToolTip="Fit all nodes to the viewport"
                 >
-                                        Fit
-                                    </Button>
+                    Fit
+                </Button>
 
-                                    <!-- 
+                <!-- 
             The fill button.  Causes the content to be scaled so that it fits in the viewport.
             -->
-                                    <Button
+                <Button
                 Grid.Column="6"
                 Command="{StaticResource Commands.Fill}"
                 ToolTip="Fit the entire content area to the viewport"
                 >
-                                        Fill
-                                    </Button>
+                    Fill
+                </Button>
 
-                                    <!-- 
+                <!-- 
             The 100% button.  Causes the content to be scaled to 100 percent.
             -->
-                                    <Button
+                <Button
                 Grid.Column="8"
                 Command="{StaticResource Commands.OneHundredPercent}"
                 ToolTip="Scale the content to 100%"
                 >
-                                        100%
-                                    </Button>
+                    100%
+                </Button>
 
-                                    <!--
+                <!--
             This is the label that shows what the current zoom level
             is while zooming in and out.
             -->
-                                    <TextBlock
+                <TextBlock
                 Grid.Column="10"
                 VerticalAlignment="Center"
                 HorizontalAlignment="Center"
                 Grid.ColumnSpan="2"
                 >
                                             <Run Text="{Binding ElementName=zoomAndPanControl, Path=ContentScale, Converter={StaticResource scaleToPercentConverter}}"/>%
-                                    </TextBlock>
+                </TextBlock>
 
-                                    <!-- Button to zoom out. -->
-                                    <Button
+                <!-- Button to zoom out. -->
+                <Button
                 Grid.Column="13"
                 Command="{StaticResource Commands.ZoomOut}"
                 ToolTip="Zoom out from the content"
                 >
-                                        -
-                                    </Button>
+                    -
+                </Button>
 
-                                    <!-- Slider to change the current zoom level. -->
-                                    <Slider
+                <!-- Slider to change the current zoom level. -->
+                <Slider
                 Grid.Column="15"
                 Minimum="10" 
                 LargeChange="20" 
@@ -757,72 +824,70 @@
                 ToolTip="Change the zoom level of the content"
                 />
 
-                                    <!--
+                <!--
             Button to zoom in.
             -->
-                                    <Button
+                <Button
                 Grid.Column="17"
                 Command="{StaticResource Commands.ZoomIn}"
                 ToolTip="Zoom in on the content"
                 >
-                                        +
-                                    </Button>
+                    +
+                </Button>
 
-                                    <!-- Stick a resize grip in the bottom right corner of the window. -->
-                                    <ResizeGrip
+                <!-- Stick a resize grip in the bottom right corner of the window. -->
+                <ResizeGrip
                 Grid.Column="19"
                 />
 
-                                </Grid>
+            </Grid>
 
-                                <!-- 
+            <!-- 
         The ScrollViewer displays scrollbars when the content is too big to fit in the viewport. 
         Focusable is set to False because it is only that NetworkView that I want to be focusable.
         -->
-                                <ScrollViewer
+            <ScrollViewer
             CanContentScroll="True"
             VerticalScrollBarVisibility="Visible"
             HorizontalScrollBarVisibility="Visible"
             Focusable="False"
             >
 
-                                    <!-- 
+                <!-- 
             The ZoomAndPanControl displays the NetworkView as its content.
             We can use the mouse to zoom and pan about the NetworkView.
             -->
-                                    <ZoomAndPan:ZoomAndPanControl
+                <ZoomAndPan:ZoomAndPanControl
                 x:Name="zoomAndPanControl"
                 ContentScale="{Binding ContentScale, Mode=TwoWay}"
                 ContentOffsetX="{Binding ContentOffsetX, Mode=TwoWay}"
                 ContentOffsetY="{Binding ContentOffsetY, Mode=TwoWay}"
                 ContentViewportWidth="{Binding ContentViewportWidth, Mode=OneWayToSource}"
                 ContentViewportHeight="{Binding ContentViewportHeight, Mode=OneWayToSource}"
-                Background="LightGray"
                 Focusable="False"
                 >
-                                        <!--
+                    <!--
                 We need to nest our NetworkView in an AdornerDecorator so that adorners work correct when
                 we zoom in and out using the ZoomAndPanControl
                 -->
-                                        <AdornerDecorator>
-                                            <!--
+                    <AdornerDecorator>
+                        <!--
                     This grid specifies the size of the ZoomAndPanControl's content.
                     It wraps up both the NetworkView and drag-zooming Canvas.
                     -->
-                                            <!--Width="10000"
+                        <!--Width="10000"
                         Height="10000"-->
-                                            <!--Width="{Binding ContentWidth}"
+                        <!--Width="{Binding ContentWidth}"
                         Height="{Binding ContentHeight}"-->
-                                            <Grid
+                        <Grid
                         Width="10000"
                         Height="10000"
+                        Background="{StaticResource GridlinesVBrush}"
                         >
-
-                                                <!-- In this sample the NetworkView is the content displayed by the ZoomAndPanControl. -->
-
-                                                <NetworkUI:NetworkView
+                            <!-- In this sample the NetworkView is the content displayed by the ZoomAndPanControl. -->
+                            <NetworkUI:NetworkView
                             x:Name="networkControl"
-                            
+                            Background="Transparent"
                             NodesSource="{Binding Network.Nodes}"
                             ConnectionsSource="{Binding Path=Network.Connections}"
                             ConnectionDragStarted="networkControl_ConnectionDragStarted"
@@ -835,16 +900,17 @@
                             MouseMove="networkControl_MouseMove"
                             MouseWheel="networkControl_MouseWheel"
                             MouseDoubleClick="networkControl_MouseDoubleClick"
+                                                    
                             />
-                                                <!--
+                            <!--
                         This Canvas and Border are used as a very simple way to render a drag rectangle that the user
                         uses to specify an area to zoom in on.
                         -->
-                                                <Canvas
+                            <Canvas
                             x:Name="dragZoomCanvas"
                             Visibility="Collapsed"
                             >
-                                                    <Border 
+                                <Border 
                                 x:Name="dragZoomBorder"
                                 BorderBrush="Black"
                                 BorderThickness="1"
@@ -852,41 +918,15 @@
                                 CornerRadius="1"
                                 Opacity="0"
                                 />
-                                                </Canvas>
+                            </Canvas>
 
 
 
-                                            </Grid>
-                                        </AdornerDecorator>
-                                    </ZoomAndPan:ZoomAndPanControl>
-                                </ScrollViewer>
-                            </DockPanel>
-                        </avalonDock:LayoutDocument>
-                    </avalonDock:LayoutDocumentPane>
-                    <avalonDock:LayoutAnchorablePane DockWidth="400">
-                        <avalonDock:LayoutAnchorable AutoHideMinWidth="400" ContentId="NodeEditor" x:Name="NodeEditorLayoutAnchorable" Title="Node Editor" CanHide="False" CanClose="False">
-                            <xctk:PropertyGrid SelectedObject="{Binding SelectedChatNode, Mode=TwoWay}" AutoGenerateProperties="True"  />
-                        </avalonDock:LayoutAnchorable>
-                    </avalonDock:LayoutAnchorablePane>
-                </avalonDock:LayoutPanel>
-                <avalonDock:LayoutRoot.BottomSide>
-                    <avalonDock:LayoutAnchorSide>
-                        <avalonDock:LayoutAnchorGroup>
-                            <avalonDock:LayoutAnchorable AutoHideMinHeight="400" x:Name="SectionButtonEditorLayoutAnchorable" ContentId="SectionButtonEditor" Title="Section Button Editor" CanHide="False" CanClose="False" >
-                                <Grid>
-                                    <Grid.ColumnDefinitions>
-                                        <ColumnDefinition />
-                                        <ColumnDefinition />
-                                    </Grid.ColumnDefinitions>
-                                    <ContentControl x:Name="SectionButtonEditor"/>
-                                    <Controls:ChatContentCollectionControl x:Name="ChatContentCollectionEditor" Grid.Column="1" Visibility="Collapsed" ParentChatNode="{Binding Path=Content.OwnerChatNode, ElementName=SectionButtonEditor}" ChatContentOwner="{Binding ElementName=SectionButtonEditor, Path=Content.SelectedItem, Mode=TwoWay, FallbackValue=null}"/>
-                                </Grid>
-                            </avalonDock:LayoutAnchorable>
-                        </avalonDock:LayoutAnchorGroup>
-                    </avalonDock:LayoutAnchorSide>
-                </avalonDock:LayoutRoot.BottomSide>
-            </avalonDock:LayoutRoot>
-        </avalonDock:DockingManager>
+                        </Grid>
+                    </AdornerDecorator>
+                </ZoomAndPan:ZoomAndPanControl>
+            </ScrollViewer>
+        </DockPanel>
         <TextBlock Grid.Row="2" x:Name="StatusTextblock" Text=" " Margin="5"/>
     </Grid>
 </Window>
\ No newline at end of file
diff --git a/ANAConversationStudio/Views/MainWindow.xaml.cs b/ANAConversationStudio/Views/MainWindow.xaml.cs
index 6f4af3a..1abd560 100644
--- a/ANAConversationStudio/Views/MainWindow.xaml.cs
+++ b/ANAConversationStudio/Views/MainWindow.xaml.cs
@@ -10,13 +10,13 @@
 using MongoDB.Bson;
 using ANAConversationStudio.ViewModels;
 using System.Reflection;
-using Xceed.Wpf.Toolkit;
 using System.Linq;
 using System.Windows.Media;
 using System.Net;
 using System.IO;
 using System.Diagnostics;
 using System.Collections.Generic;
+using System.Threading.Tasks;
 
 namespace ANAConversationStudio.Views
 {
@@ -182,7 +182,7 @@ private void cloneSelectedNodes()
         {
             if (networkControl.SelectedNode == null)
             {
-                System.Windows.MessageBox.Show("Please select a node to clone it", "No node selected");
+                MessageBox.Show("Please select a node to clone it", "No node selected");
                 return;
             }
             if (networkControl.SelectedNodes != null)
@@ -196,7 +196,7 @@ private void CloneSelectedNodeClick(object sender, RoutedEventArgs e)
 
         private void ConvSimMenuClick(object sender, RoutedEventArgs e)
         {
-            var p = System.Diagnostics.Process.Start("anaconsim://");
+            var p = Process.Start("anaconsim://");
         }
 
         private async void UpdateMenuClick(object sender, RoutedEventArgs e)
@@ -218,7 +218,7 @@ private async void UpdateMenuClick(object sender, RoutedEventArgs e)
                     Status("Downloading...");
                     await wc.DownloadFileTaskAsync(updateInfo.DownloadLink, tempFile);
                     Status("Download Complete");
-                    if (System.Windows.MessageBox.Show("Update is ready to be installed. Click ok to install. It will close the application. You can start the studio as soon as it's extraction is done", "Update", MessageBoxButton.OKCancel) == MessageBoxResult.OK)
+                    if (MessageBox.Show("Update is ready to be installed. Click ok to install. It will close the application. You can start the studio as soon as it's extraction is done", "Update", MessageBoxButton.OKCancel) == MessageBoxResult.OK)
                     {
                         var tempPath = Path.GetTempPath();
                         var srcPath = Path.Combine(Environment.CurrentDirectory, "Tools");
@@ -280,6 +280,38 @@ private void PrevNode_Executed(object sender, ExecutedRoutedEventArgs e)
                 position = 4;
             GotoPreviousNode(position);
         }
+
+        private void NewChatFlowClick(object sender, RoutedEventArgs e)
+        {
+            ChatFlowsManagerWindow w = new ChatFlowsManagerWindow();
+            w.ShowDialog();
+        }
+
+        private void ManageChatFlowsClick(object sender, RoutedEventArgs e)
+        {
+            ChatFlowsManagerWindow w = new ChatFlowsManagerWindow();
+            w.ShowDialog();
+        }
+
+        private void ConvSimWithChatMenuClick(object sender, RoutedEventArgs e)
+        {
+            StartChatInSimulator();
+        }
+
+        private void StartChatInSimulator()
+        {
+            if (StudioContext.Current?.ChatServer?.ServerUrl == null)
+            {
+                System.Windows.MessageBox.Show("No project is loaded at the moment");
+                return;
+            }
+            Process.Start("anaconsim://app?chatflow=" + Uri.EscapeDataString(StudioContext.Current.ChatServer.ServerUrl + "/api/Conversation/chat?projectId=" + StudioContext.Current.ChatFlow.ProjectId));
+        }
+
+        private void StartInSimulator_Executed(object sender, ExecutedRoutedEventArgs e)
+        {
+            StartChatInSimulator();
+        }
     }
 
     /// <summary>
@@ -475,7 +507,7 @@ private void networkControl_MouseMove(object sender, MouseEventArgs e)
             else if (mouseHandlingMode == MouseHandlingMode.DragZooming)
             {
                 //
-                // When in drag zooming mode continously update the position of the rectangle
+                // When in drag zooming mode continuously update the position of the rectangle
                 // that the user is dragging out.
                 //
                 Point curContentMousePoint = e.GetPosition(networkControl);
@@ -522,7 +554,10 @@ private void networkControl_MouseDoubleClick(object sender, MouseButtonEventArgs
         private void OpenNodeEditor()
         {
             if (this.ViewModel.SelectedChatNode != null)
-                NodeEditorLayoutAnchorable.IsActive = true;
+            {
+                var editor = new NodeEditWindow(this.ViewModel.SelectedChatNode);
+                editor.ShowDialog();
+            }
         }
 
         /// <summary>
@@ -688,7 +723,7 @@ private void SetDragZoomRect(Point pt1, Point pt2)
             double x, y, width, height;
 
             //
-            // Deterine x,y,width and height of the rect inverting the points if necessary.
+            // Determine x,y,width and height of the rect inverting the points if necessary.
             // 
 
             if (pt2.X < pt1.X)
@@ -734,7 +769,7 @@ private void ApplyDragZoomRect()
             SavePrevZoomRect();
 
             //
-            // Retreive the rectangle that the user draggged out and zoom in on it.
+            // Retrieve the rectangle that the user dragged out and zoom in on it.
             //
             double contentX = Canvas.GetLeft(dragZoomBorder);
             double contentY = Canvas.GetTop(dragZoomBorder);
@@ -781,15 +816,6 @@ private void ClearPrevZoomRect()
     /// </summary>
     public partial class MainWindow : Window
     {
-        public CollectionControl NodeCollectionControl
-        {
-            get { return SectionButtonEditor.Content as CollectionControl; }
-            set
-            {
-                SectionButtonEditor.Content = null;
-                SectionButtonEditor.Content = value;
-            }
-        }
         private bool AskPass()
         {
             if (!Settings.IsEncrypted())
@@ -807,23 +833,33 @@ private bool AskPass()
         }
         private void MainWindow_Loaded(object sender, RoutedEventArgs e)
         {
-            Title += " " + GetVersion();
             this.IsEnabled = false;
             if (!AskPass()) return;
 
             this.IsEnabled = true;
-            LoadSavedConnections();
+            AskToSelectChatServer();
+            LoadProjects();
             CheckForUpdates();
+            UpdateTitle();
+
+        }
+        private void UpdateTitle()
+        {
+            var chatServerName = StudioContext.Current?.ChatServer?.Name;
+            var chatProjectName = StudioContext.Current?.ChatFlowProjects?.FirstOrDefault(x => x._id == StudioContext.Current?.ChatFlow?.ProjectId)?.Name;
 
-            #region Overview Windows Commented
-            //OverviewWindow overviewWindow = new OverviewWindow();
-            //overviewWindow.Left = this.Left;
-            //overviewWindow.Top = this.Top + this.Height + 5;
-            //overviewWindow.Owner = this;
-            //overviewWindow.DataContext = this.ViewModel; // Pass the view model onto the overview window.
-            //overviewWindow.Show(); 
-            #endregion
+            var title = $"{chatServerName} : {chatProjectName}";
+            if (string.IsNullOrWhiteSpace(chatServerName) || string.IsNullOrWhiteSpace(chatProjectName))
+                Title = $"ANA Conversation Studio {GetVersion()}";
+            else
+                Title = $"{title} - ANA Conversation Studio {GetVersion()}";
         }
+        private void AskToSelectChatServer()
+        {
+            SaveChatServersManager man = new SaveChatServersManager();
+            man.ShowDialog();
+        }
+
         private Version GetVersion() => Assembly.GetExecutingAssembly().GetName().Version;
         private async void CheckForUpdates()
         {
@@ -840,15 +876,16 @@ private async void CheckForUpdates()
             else
             {
                 HelpMenu.Background = null;
-                HelpMenu.Foreground = new SolidColorBrush(Colors.Black);
+                HelpMenu.Foreground = App.Current.Resources["FileMenuForegroundBrush"] as SolidColorBrush;
                 UpdateMenuItem.Header = $"No update available!";
                 UpdateMenuItem.IsEnabled = false;
             }
         }
         public bool AskAlert = true;
-        private void MainWindow_Closing(object sender, System.ComponentModel.CancelEventArgs e)
+        private async void MainWindow_Closing(object sender, System.ComponentModel.CancelEventArgs e)
         {
             if (!AskAlert) return;
+            if (StudioContext.Current == null) return;
             var op = System.Windows.MessageBox.Show("Save changes?", "Hold on!", MessageBoxButton.YesNoCancel);
             if (op == MessageBoxResult.Cancel)
             {
@@ -857,7 +894,7 @@ private void MainWindow_Closing(object sender, System.ComponentModel.CancelEvent
             }
             if (op == MessageBoxResult.Yes)
             {
-                SaveEdits();
+                await SaveEditsAsync();
             }
         }
 
@@ -872,7 +909,6 @@ private void networkControl_SelectionChanged(object sender, SelectionChangedEven
                 this.ViewModel.SelectedChatNode = null;
                 this.ViewModel.SelectedChatNode = node.ChatNode;
                 this.ViewModel.SelectedChatNode.PropertyChanged += SelectedChatNode_PropertyChanged;
-                NodeCollectionControl = null;
             }
         }
 
@@ -883,116 +919,72 @@ private void SelectedChatNode_PropertyChanged(object sender, System.ComponentMod
                 this.ViewModel.Network.Nodes.Select(x => x.ChatNode).Where(x => x.Id != senderNode.Id && x.IsStartNode).ToList().ForEach(x => x.IsStartNode = false);
         }
 
-        private void SaveButtonClick(object sender, RoutedEventArgs e)
+        private async void SaveButtonClick(object sender, RoutedEventArgs e)
         {
-            SaveEdits();
+            await SaveEditsAsync();
         }
-        private void Save_Executed(object sender, ExecutedRoutedEventArgs e)
+        private async void Save_Executed(object sender, ExecutedRoutedEventArgs e)
         {
-            SaveEdits();
+            await SaveEditsAsync();
         }
 
-        #region TODO: Window Layout Save and Load Functions 
-        //private void dockingManager_Loaded(object sender, RoutedEventArgs e)
-        //{
-        //    if (File.Exists(Constants.WindowLayoutFileName))
-        //    {
-        //        try
-        //        {
-        //            XmlLayoutSerializer layoutSerializer = new XmlLayoutSerializer(dockingManager);
-        //            layoutSerializer.Deserialize(Constants.WindowLayoutFileName);
-        //        }
-        //        catch (Exception ex)
-        //        {
-        //            System.Windows.MessageBox.Show(ex.StackTrace, "Window Layout Read Error: " + ex.Message);
-        //        }
-        //    }
-        //}
-
-        //private void LoadWindowLayout()
-        //{
-        //    try
-        //    {
-        //        XmlLayoutSerializer layoutSerializer = new XmlLayoutSerializer(dockingManager);
-        //        layoutSerializer.Serialize(Constants.WindowLayoutFileName);
-        //    }
-        //    catch { }
-        //} 
-        #endregion
-
-        private void SaveEdits()
+        private async Task SaveEditsAsync()
         {
             try
             {
                 if (this.ViewModel.Network == null) return;
-
-                this.ViewModel.SaveNetworkLayout();
-                this.ViewModel.SaveChatNodes();
-                MongoHelper.Current.SaveChatContent();
+                await this.ViewModel.SaveLoadedChat();
                 StatusTextBlock.Text = "Saved at " + DateTime.Now.ToShortTimeString();
             }
             catch (Exception ex)
             {
-                System.Windows.MessageBox.Show(ex.StackTrace, "Error: " + ex.Message);
+                MessageBox.Show(ex.StackTrace, "Error: " + ex.Message);
             }
         }
 
-        private bool LoadFileMenuSavedConnections()
+        public bool LoadFileMenuSavedConnections()
         {
-            if (Utilities.Settings.SavedConnections.Count <= 0)
+            if (StudioContext.Current?.ChatFlowProjects == null || StudioContext.Current?.ChatFlowProjects.Count <= 0)
             {
                 SavedConnectionsFileMenu.IsEnabled = false;
                 return false;
             }
-            SavedConnectionsFileMenu.ItemsSource = Utilities.Settings.SavedConnections;
+            SavedConnectionsFileMenu.ItemsSource = StudioContext.Current.ChatFlowProjects;
             SavedConnectionsFileMenu.IsEnabled = true;
             return true;
         }
-        private void LoadSavedConnections()
+        private async void LoadProjects()
         {
             if (LoadFileMenuSavedConnections())
-                LoadConnection(Utilities.Settings.SavedConnections.First());
+                await LoadProjectAsync(StudioContext.Current.ChatFlowProjects.First());
         }
         public void Status(string txt)
         {
             StatusTextblock.Text = txt;
         }
-        private void SavedConnectionClick(object sender, RoutedEventArgs e)
+        private async void SavedConnectionClick(object sender, RoutedEventArgs e)
         {
-            LoadConnection((sender as MenuItem).Tag as DatabaseConnection);
+            await LoadProjectAsync((sender as MenuItem).Tag as ANAProject);
         }
 
-        private void LoadConnection(DatabaseConnection conn)
+        public async Task LoadProjectAsync(ANAProject proj)
         {
-            if (conn == null)
-            {
-                Status("Unable to load.");
-                return;
-            }
-            if (!conn.IsValid())
-            {
-                Status("Invalid Connection. Please edit and complete it.");
-                return;
-            }
-            MongoHelper.Current = new MongoHelper(conn);
-            this.ViewModel.LoadNodesFromDB();
+            await StudioContext.Current.LoadChatFlowAsync(proj._id);
+            this.ViewModel.LoadNodes();
             Status("Loaded");
-            System.Threading.Tasks.Task.Delay(500).ContinueWith((s) =>
+            UpdateTitle();
+
+#pragma warning disable CS4014 // Because this call is not awaited, execution of the current method continues before the call is completed
+            Task.Delay(500).ContinueWith((s) =>
             {
                 Dispatcher.Invoke(() => this.FitContent_Executed(null, null));
             });
+#pragma warning restore CS4014 // Because this call is not awaited, execution of the current method continues before the call is completed
         }
 
-        private void ManageConnectionClick(object sender, RoutedEventArgs e)
-        {
-            DBConnectionManager man = new DBConnectionManager(Utilities.Settings.SavedConnections);
-            man.ShowDialog();
-            LoadFileMenuSavedConnections();
-        }
         private void ResetEditors()
         {
             this.ViewModel.SelectedChatNode = null;
-            NodeCollectionControl = null;
         }
 
         public void GotoNextNode(int position = 1)
diff --git a/ANAConversationStudio/Views/NodeEditWindow.xaml b/ANAConversationStudio/Views/NodeEditWindow.xaml
new file mode 100644
index 0000000..951ec66
--- /dev/null
+++ b/ANAConversationStudio/Views/NodeEditWindow.xaml
@@ -0,0 +1,240 @@
+<Window x:Class="ANAConversationStudio.Views.NodeEditWindow"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:uc="clr-namespace:ANAConversationStudio.UserControls"
+        xmlns:local="clr-namespace:ANAConversationStudio.Views"
+        xmlns:ui="clr-namespace:ANAConversationStudio.UIHelpers"
+        xmlns:chat="clr-namespace:ANAConversationStudio.Models.Chat"
+        xmlns:chatSections="clr-namespace:ANAConversationStudio.Models.Chat.Sections"
+        
+        TextElement.Foreground="{DynamicResource MaterialDesignBody}"
+        Background="{DynamicResource MaterialDesignPaper}"
+        mc:Ignorable="d"
+        Name="Dialog"
+        WindowStartupLocation="CenterScreen"
+        Title="Node Edit Dialog" Height="700" Width="600">
+    <Window.Resources>
+        <local:NodeTypeToGroupVisibilityConverter x:Key="NodeTypeToGroupVisibilityConverter" />
+        <ui:EditSectionTemplateSelector x:Key="EditSectionTemplateSelector" />
+        <ui:ObservableCollectionStringJoinConverter x:Key="ObservableCollectionStringJoinConverter"/>
+        <Style TargetType="GroupBox" BasedOn="{StaticResource {x:Type GroupBox}}">
+            <Setter Property="Margin" Value="5"/>
+        </Style>
+        <Style TargetType="TextBlock" BasedOn="{StaticResource {x:Type TextBlock}}">
+            <Setter Property="Margin" Value="0,5" />
+            <Setter Property="TextWrapping" Value="Wrap" />
+            <Setter Property="VerticalAlignment" Value="Center" />
+        </Style>
+        <Style TargetType="TextBox" BasedOn="{StaticResource {x:Type TextBox}}">
+            <Setter Property="Margin" Value="5" />
+            <Setter Property="VerticalAlignment" Value="Center" />
+            <Setter Property="TextWrapping" Value="Wrap" />
+        </Style>
+        <Style TargetType="CheckBox" BasedOn="{StaticResource {x:Type CheckBox}}">
+            <Setter Property="Margin" Value="3,5" />
+            <Setter Property="VerticalAlignment" Value="Center" />
+        </Style>
+        <Style TargetType="ComboBox" BasedOn="{StaticResource {x:Type ComboBox}}">
+            <Setter Property="Margin" Value="5" />
+            <Setter Property="VerticalAlignment" Value="Center" />
+        </Style>
+        <Style TargetType="uc:TableRowUserControl" >
+            <Setter Property="LabelWidth" Value="120" />
+        </Style>
+        <Style x:Key="ToolTextButtonStyle" TargetType="Button" BasedOn="{StaticResource MaterialDesignToolButton}" >
+            <Setter Property="Margin" Value="5,0" />
+            <Setter Property="Padding" Value="0" />
+            <Setter Property="Height" Value="Auto" />
+            <Setter Property="Foreground" Value="White" />
+            <Setter Property="VerticalAlignment" Value="Center" />
+        </Style>
+        <Style x:Key="NodeTypeIconTextblockStyle" TargetType="TextBlock">
+            <Setter Property="FontFamily" Value="{StaticResource MDL2Assets}"/>
+            <Setter Property="FontSize" Value="20"/>
+            <Setter Property="ToolTip" >
+                <Setter.Value>
+                    <TextBlock>
+                    <Run Text="{Binding NodeType}" /><Run Text=" Node" />
+                    </TextBlock>
+                </Setter.Value>
+            </Setter>
+            <Setter Property="Margin" Value="0,0,10,0"/>
+            <Setter Property="Text" Value="{Binding NodeType, Converter={StaticResource ButtonSectionTypeSymbolConverter}}"/>
+            <Setter Property="VerticalAlignment" Value="Center"/>
+        </Style>
+        <Style x:Key="AddSectionButtonStyle" TargetType="Button" BasedOn="{StaticResource ToolButtonStyle}">
+            <Style.Triggers>
+                <EventTrigger RoutedEvent="Click">
+                    <EventTrigger.Actions>
+                        <BeginStoryboard>
+                            <Storyboard>
+                                <BooleanAnimationUsingKeyFrames Storyboard.TargetProperty="ContextMenu.IsOpen">
+                                    <DiscreteBooleanKeyFrame KeyTime="0:0:0" Value="True"/>
+                                </BooleanAnimationUsingKeyFrames>
+                            </Storyboard>
+                        </BeginStoryboard>
+                    </EventTrigger.Actions>
+                </EventTrigger>
+            </Style.Triggers>
+            <Setter Property="Content" >
+                <Setter.Value>
+                    <TextBlock Text="&#xE948;" VerticalAlignment="Center" FontFamily="{StaticResource MDL2Assets}"/>
+                </Setter.Value>
+            </Setter>
+            <Setter Property="ToolTip" Value="Add Section"/>
+        </Style>
+    </Window.Resources>
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition/>
+            <RowDefinition Height="Auto"/>
+        </Grid.RowDefinitions>
+        <ScrollViewer VerticalScrollBarVisibility="Auto">
+            <StackPanel>
+                <GroupBox Header="{Binding ChatNode}" Margin="0">
+                    <GroupBox.HeaderTemplate>
+                        <DataTemplate>
+                            <Grid>
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="Auto"/>
+                                    <ColumnDefinition/>
+                                    <ColumnDefinition Width="Auto"/>
+                                </Grid.ColumnDefinitions>
+                                <TextBlock Style="{StaticResource NodeTypeIconTextblockStyle}" Grid.Column="0"/>
+                                <TextBlock VerticalAlignment="Center" Grid.Column="1">
+                                    <Run  Text="Node: "/><Run  Text="{Binding Alias}"/>
+                                </TextBlock>
+                                <Button Grid.Column="2" Style="{DynamicResource ToolTextButtonStyle}" Content="Copy Id" ToolTip="Copy node id to clipboard" Click="CopyNodeIdClick"/>
+                            </Grid>
+                        </DataTemplate>
+                    </GroupBox.HeaderTemplate>
+                    <StackPanel>
+                        <StackPanel Margin="10">
+                            <uc:TableRowUserControl Label="Name">
+                                <uc:TableRowUserControl.Field>
+                                    <TextBox Text="{Binding ChatNode.Name, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" />
+                                </uc:TableRowUserControl.Field>
+                            </uc:TableRowUserControl>
+                            <uc:TableRowUserControl Label="Type">
+                                <uc:TableRowUserControl.Field>
+                                    <ComboBox ItemsSource="{Binding NodeTypes}" SelectedItem="{Binding ChatNode.NodeType, Mode=TwoWay}" />
+                                </uc:TableRowUserControl.Field>
+                            </uc:TableRowUserControl>
+                            <uc:TableRowUserControl Label="Mark as start node">
+                                <uc:TableRowUserControl.Field>
+                                    <CheckBox IsChecked="{Binding ChatNode.IsStartNode, Mode=TwoWay}" />
+                                </uc:TableRowUserControl.Field>
+                            </uc:TableRowUserControl>
+                            <uc:TableRowUserControl Label="Variable Name">
+                                <uc:TableRowUserControl.Field>
+                                    <TextBox Text="{Binding ChatNode.VariableName, Mode=TwoWay}" />
+                                </uc:TableRowUserControl.Field>
+                            </uc:TableRowUserControl>
+                        </StackPanel>
+                        <GroupBox Header="API Call Details"  Visibility="{Binding ChatNode.NodeType, Converter={StaticResource NodeTypeToGroupVisibilityConverter}, ConverterParameter={x:Static chat:NodeTypeEnum.ApiCall}}">
+                            <StackPanel>
+                                <uc:TableRowUserControl Label="API Method">
+                                    <uc:TableRowUserControl.Field>
+                                        <ComboBox SelectedItem="{Binding ChatNode.ApiMethod, Mode=TwoWay}" ItemsSource="{Binding APIMethods}" >
+                                            <ComboBox.ItemTemplate>
+                                                <DataTemplate>
+                                                    <TextBlock Text="{Binding}" Padding="4"/>
+                                                </DataTemplate>
+                                            </ComboBox.ItemTemplate>
+                                        </ComboBox>
+                                    </uc:TableRowUserControl.Field>
+                                </uc:TableRowUserControl>
+                                <uc:TableRowUserControl Label="API Url">
+                                    <uc:TableRowUserControl.Field>
+                                        <TextBox Text="{Binding ChatNode.ApiUrl, Mode=TwoWay}" />
+                                    </uc:TableRowUserControl.Field>
+                                </uc:TableRowUserControl>
+                                <uc:TableRowUserControl Label="Next Node Id">
+                                    <uc:TableRowUserControl.Field>
+                                        <TextBox Text="{Binding ChatNode.NextNodeId, Mode=TwoWay}" />
+                                    </uc:TableRowUserControl.Field>
+                                </uc:TableRowUserControl>
+                                <uc:TableRowUserControl Label="API Response Data Root">
+                                    <uc:TableRowUserControl.Field>
+                                        <TextBox Text="{Binding ChatNode.ApiResponseDataRoot, Mode=TwoWay}" />
+                                    </uc:TableRowUserControl.Field>
+                                </uc:TableRowUserControl>
+                                <uc:TableRowUserControl Label="Required Variables">
+                                    <uc:TableRowUserControl.Field>
+                                        <TextBox Text="{Binding ChatNode.RequiredVariables, Converter={StaticResource ObservableCollectionStringJoinConverter}, Mode=TwoWay}" AcceptsReturn="True" />
+                                    </uc:TableRowUserControl.Field>
+                                </uc:TableRowUserControl>
+                            </StackPanel>
+                        </GroupBox>
+                        <GroupBox Header="Card Details" Visibility="{Binding ChatNode.NodeType, Converter={StaticResource NodeTypeToGroupVisibilityConverter}, ConverterParameter={x:Static chat:NodeTypeEnum.Card}}">
+                            <StackPanel>
+                                <uc:TableRowUserControl Label="Header">
+                                    <uc:TableRowUserControl.Field>
+                                        <TextBox Text="{Binding ChatNode.CardHeader, Mode=TwoWay}" />
+                                    </uc:TableRowUserControl.Field>
+                                </uc:TableRowUserControl>
+                                <uc:TableRowUserControl Label="Footer">
+                                    <uc:TableRowUserControl.Field>
+                                        <TextBox Text="{Binding ChatNode.ApiResponseDataRoot, Mode=TwoWay}" />
+                                    </uc:TableRowUserControl.Field>
+                                </uc:TableRowUserControl>
+                                <uc:TableRowUserControl Label="Placement">
+                                    <uc:TableRowUserControl.Field>
+                                        <ComboBox SelectedItem="{Binding ChatNode.Placement, Mode=TwoWay}" ItemsSource="{Binding PlacementOptions}"/>
+                                    </uc:TableRowUserControl.Field>
+                                </uc:TableRowUserControl>
+                            </StackPanel>
+                        </GroupBox>
+                        <GroupBox Header="Sections">
+                            <GroupBox.HeaderTemplate>
+                                <DataTemplate>
+                                    <Grid>
+                                        <Grid.ColumnDefinitions>
+                                            <ColumnDefinition/>
+                                            <ColumnDefinition Width="Auto"/>
+                                        </Grid.ColumnDefinitions>
+                                        <TextBlock Text="{Binding}" VerticalAlignment="Center"/>
+                                        <Button Style="{StaticResource AddSectionButtonStyle}" Grid.Column="1">
+                                            <Button.ContextMenu>
+                                                <ContextMenu>
+                                                    <MenuItem Header="Text" Click="AddSectionClick" Tag="{x:Static chatSections:SectionTypeEnum.Text}"/>
+                                                    <MenuItem Header="Image" Click="AddSectionClick" Tag="{x:Static chatSections:SectionTypeEnum.Image}" />
+                                                    <MenuItem Header="Gif" Click="AddSectionClick" Tag="{x:Static chatSections:SectionTypeEnum.Gif}"/>
+                                                    <MenuItem Header="Audio" Click="AddSectionClick" Tag="{x:Static chatSections:SectionTypeEnum.Audio}"/>
+                                                    <MenuItem Header="Video" Click="AddSectionClick" Tag="{x:Static chatSections:SectionTypeEnum.Video}"/>
+                                                    <MenuItem Header="Carousel" Click="AddSectionClick" Tag="{x:Static chatSections:SectionTypeEnum.Carousel}"/>
+                                                    <MenuItem Header="Embedded HTML" Click="AddSectionClick" Tag="{x:Static chatSections:SectionTypeEnum.EmbeddedHtml}"/>
+                                                </ContextMenu>
+                                            </Button.ContextMenu>
+                                        </Button>
+                                    </Grid>
+                                </DataTemplate>
+                            </GroupBox.HeaderTemplate>
+                            <ItemsControl ItemsSource="{Binding ChatNode.Sections}" ItemTemplateSelector="{StaticResource EditSectionTemplateSelector}"/>
+                        </GroupBox>
+                        <GroupBox Header="Buttons">
+                            <GroupBox.HeaderTemplate>
+                                <DataTemplate>
+                                    <Grid>
+                                        <Grid.ColumnDefinitions>
+                                            <ColumnDefinition/>
+                                            <ColumnDefinition Width="Auto"/>
+                                        </Grid.ColumnDefinitions>
+                                        <TextBlock Text="{Binding}" VerticalAlignment="Center"/>
+                                        <Button Style="{StaticResource AddButtonStyle}" Grid.Column="1" Click="AddButtonClick" ToolTip="Add Button"/>
+                                    </Grid>
+                                </DataTemplate>
+                            </GroupBox.HeaderTemplate>
+                            <ItemsControl ItemsSource="{Binding ChatNode.Buttons}" ItemTemplate="{StaticResource ChatButtonEditTemplate}"/>
+                        </GroupBox>
+                    </StackPanel>
+                </GroupBox>
+            </StackPanel>
+        </ScrollViewer>
+        <Grid Grid.Row="1">
+            <Button Content="Done" Click="DoneButtonClick" HorizontalAlignment="Center" Margin="10"/>
+        </Grid>
+    </Grid>
+</Window>
\ No newline at end of file
diff --git a/ANAConversationStudio/Views/NodeEditWindow.xaml.cs b/ANAConversationStudio/Views/NodeEditWindow.xaml.cs
new file mode 100644
index 0000000..d39ae79
--- /dev/null
+++ b/ANAConversationStudio/Views/NodeEditWindow.xaml.cs
@@ -0,0 +1,157 @@
+using ANAConversationStudio.Models.Chat;
+using ANAConversationStudio.Models.Chat.Sections;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Windows;
+using System.Windows.Data;
+using System.Globalization;
+using System.Windows.Threading;
+
+namespace ANAConversationStudio.Views
+{
+    public partial class NodeEditWindow : Window
+    {
+        public NodeEditWindow(ChatNode chatNode)
+        {
+            InitializeComponent();
+            ChatNode = chatNode;
+            DataContext = this;
+        }
+
+        public ChatNode ChatNode
+        {
+            get { return (ChatNode)GetValue(ChatNodeProperty); }
+            set { SetValue(ChatNodeProperty, value); }
+        }
+        public static readonly DependencyProperty ChatNodeProperty = DependencyProperty.Register("ChatNode", typeof(ChatNode), typeof(NodeEditWindow), new PropertyMetadata((s, e) =>
+        {
+            var editor = s as NodeEditWindow;
+            var chatNode = e.NewValue as ChatNode;
+            if (chatNode != null)
+            {
+                foreach (var section in chatNode.Sections)
+                {
+                    section.ParentNode = chatNode;
+
+                    var carSec = section as CarouselSection;
+                    if (carSec != null)
+                    {
+                        if (carSec.Items != null)
+                            foreach (var carItem in carSec.Items)
+                            {
+                                carItem.ParentCarouselSection = carSec;
+                                if (carItem.Buttons != null)
+                                    foreach (var carBtn in carItem.Buttons)
+                                        carBtn.ParentCarouselItem = carItem;
+                            }
+                    }
+                }
+                foreach (var button in chatNode.Buttons)
+                    button.ParentNode = chatNode;
+            }
+        }));
+
+        private void AddSectionClick(object sender, RoutedEventArgs e)
+        {
+            ChatNode.AddSection.Execute((SectionTypeEnum)(sender as FrameworkElement).Tag);
+        }
+
+        private void AddButtonClick(object sender, RoutedEventArgs e)
+        {
+            ChatNode.AddButton.Execute(this);
+        }
+
+        #region Combo box item source
+        public IEnumerable<Placement> PlacementOptions => Enum.GetValues(typeof(Placement)).Cast<Placement>();
+        public IEnumerable<NodeTypeEnum> NodeTypes => Enum.GetValues(typeof(NodeTypeEnum)).Cast<NodeTypeEnum>();
+        public IEnumerable<ApiMethodEnum> APIMethods => Enum.GetValues(typeof(ApiMethodEnum)).Cast<ApiMethodEnum>();
+        #endregion
+
+        private void DoneButtonClick(object sender, RoutedEventArgs e)
+        {
+            Close();
+        }
+
+        private void CopyNodeIdClick(object sender, RoutedEventArgs e)
+        {
+            Clipboard.SetText(ChatNode?.Id);
+        }
+    }
+
+    public class NodeTypeToGroupVisibilityConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            var srcType = (NodeTypeEnum)value;
+            var visibleOnlyFor = (NodeTypeEnum)parameter;
+            return srcType == visibleOnlyFor ? Visibility.Visible : Visibility.Collapsed;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            return value;
+        }
+    }
+
+    public class ButtonTypeToFieldVisibilityConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            var fieldName = parameter as string;
+            var buttonType = (ButtonTypeEnum)value;
+            var hidden = false;
+
+            switch (buttonType)
+            {
+                case ButtonTypeEnum.PostText:
+                    hidden = true; //Hide all. Probably!
+                    break;
+                case ButtonTypeEnum.OpenUrl:
+                    hidden = !(new[] { nameof(Button.Url) }.Contains(fieldName));//Show only Url field
+                    break;
+                case ButtonTypeEnum.GetText:
+                case ButtonTypeEnum.GetNumber:
+                case ButtonTypeEnum.GetAddress:
+                case ButtonTypeEnum.GetEmail:
+                case ButtonTypeEnum.GetPhoneNumber:
+                    //if the passed button property is present in the list, that field should not be visible. here placeholder text should not be visible if button type is input(Get[X]) type
+                    hidden = new[] { nameof(Button.DeepLinkUrl), nameof(Button.Url), nameof(Button.APIResponseMatchKey), nameof(Button.APIResponseMatchValue) }.Contains(fieldName);
+                    break;
+                case ButtonTypeEnum.GetImage:
+                case ButtonTypeEnum.GetAudio:
+                case ButtonTypeEnum.GetVideo:
+                    //if the passed button property is present in the list, that field should not be visible. here placeholder text should not be visible if button type is input(Get[X]) type
+                    hidden = new[] { nameof(Button.DeepLinkUrl), nameof(Button.PlaceholderText), nameof(Button.Url), nameof(Button.PostfixText), nameof(Button.PrefixText), nameof(Button.APIResponseMatchKey), nameof(Button.APIResponseMatchValue) }.Contains(fieldName);
+                    break;
+                case ButtonTypeEnum.GetItemFromSource:
+                    hidden = new[] { nameof(Button.DeepLinkUrl), nameof(Button.APIResponseMatchKey), nameof(Button.APIResponseMatchValue) }.Contains(fieldName);
+                    break;
+                case ButtonTypeEnum.NextNode:
+                    hidden = new[] { nameof(Button.PostfixText), nameof(Button.PrefixText), nameof(Button.DeepLinkUrl), nameof(Button.Url), nameof(Button.PlaceholderText), }.Contains(fieldName);
+                    break;
+                case ButtonTypeEnum.DeepLink:
+                    hidden = new[] { nameof(Button.Url), nameof(Button.PostfixText), nameof(Button.PrefixText), nameof(Button.PlaceholderText), nameof(Button.APIResponseMatchKey), nameof(Button.APIResponseMatchValue) }.Contains(fieldName);
+                    break;
+                case ButtonTypeEnum.GetAgent:
+                    hidden = true; //Hide all. Probably!
+                    break;
+                case ButtonTypeEnum.ShowConfirmation:
+                    hidden = true; //Hide all. Probably!
+                    break;
+                case ButtonTypeEnum.FetchChatFlow:
+                    hidden = new[] { nameof(Button.DeepLinkUrl), nameof(Button.PlaceholderText), nameof(Button.PostfixText), nameof(Button.PrefixText), nameof(Button.APIResponseMatchKey), nameof(Button.APIResponseMatchValue) }.Contains(fieldName);
+                    break;
+                default:
+                    break;
+            }
+
+            return hidden ? Visibility.Collapsed : Visibility.Visible;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            return value;
+        }
+    }
+}
diff --git a/ANAConversationStudio/Views/OverviewWindow.xaml b/ANAConversationStudio/Views/OverviewWindow.xaml
deleted file mode 100644
index b200efe..0000000
--- a/ANAConversationStudio/Views/OverviewWindow.xaml
+++ /dev/null
@@ -1,216 +0,0 @@
-<Window x:Class="ANAConversationStudio.Views.OverviewWindow"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="clr-namespace:ANAConversationStudio"
-    xmlns:NetworkModel="clr-namespace:ANAConversationStudio.Models"
-    xmlns:VM="clr-namespace:ANAConversationStudio.ViewModels"
-    xmlns:Controls="clr-namespace:ANAConversationStudio.Controls"
-    xmlns:NetworkUI="clr-namespace:NetworkUI;assembly=NetworkUI"
-    xmlns:ZoomAndPan="clr-namespace:ZoomAndPan;assembly=ZoomAndPan"
-    Title="Overview" 
-    Height="200" 
-    Width="200" 
-    WindowStyle="ToolWindow"
-    ShowInTaskbar="False" 
-    ShowActivated="False"
-    MouseDown="Window_MouseDown" Icon="/ANAConversationStudio;component/favicon.ico"
-    >
-    <Window.Resources>
-
-        <ResourceDictionary>
-            <ResourceDictionary.MergedDictionaries>
-                <!-- 
-                Merge in the resource dictionary that contains network visual templates
-                that are shared between the main window and the overview window.
-                -->
-                <ResourceDictionary 
-                    Source="/Styles/SharedVisualTemplates.xaml"
-                    />
-            </ResourceDictionary.MergedDictionaries>
-
-            <!-- 
-            Define the visual style for a 'ConnectorItem'.
-            -->
-            <Style 
-                TargetType="{x:Type NetworkUI:ConnectorItem}"
-                >
-
-                <!-- The visual template. -->
-                <Setter 
-                    Property="Template"
-                    >
-                    <Setter.Value>
-                        <ControlTemplate 
-                            TargetType="{x:Type NetworkUI:ConnectorItem}"
-                            >
-                            <!-- The visual for the connector. -->
-                            <Ellipse
-                                Stroke="{StaticResource nodeBorderBrush}"
-                                Fill="{StaticResource connectorBackgroundBrush}"
-                                />
-                        </ControlTemplate>
-                    </Setter.Value>
-                </Setter>
-            </Style>
-
-            <!-- 
-            Data-template for ConectionViewModel.
-            
-            In this sample a curved arrow represents connections between nodes.
-            -->
-            <DataTemplate 
-                DataType="{x:Type VM:ConnectionViewModel}"
-                >
-
-                <!-- The connection is represented by a curved arrow. -->
-
-                <Controls:CurvedArrow
-                    Stroke="{StaticResource connectionBrush}"
-                    StrokeThickness="2"
-                    Fill="{StaticResource connectionBrush}"
-                    Points="{Binding Points}"
-                    />
-            </DataTemplate>
-
-            <!-- Define a data-template for the 'NodeViewModel' class. -->
-            <DataTemplate
-                DataType="{x:Type VM:NodeViewModel}"
-                >
-
-                <!-- The margin has been selected so that the selection rect nicely covers the entire node. -->
-
-                <Grid
-                    MinWidth="120"
-                    Margin="10,6,10,6"
-                    >
-
-                    <!-- This rectangle is the main visual for the node. -->
-
-                    <Rectangle
-                        Stroke="{StaticResource nodeBorderBrush}"
-                        StrokeThickness="1.3"
-                        RadiusX="4"
-                        RadiusY="4"
-                        Fill="{StaticResource nodeFillBrush}"
-                        />
-
-                    <!-- 
-                    This grid contains the node's connectors.
-                    The margin is negative so that the connectors overlap the body of the node and it's selection border.
-                    -->
-                    <Grid
-                        Margin="-6,4,-6,4"
-                        >
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="Auto" />
-                            <ColumnDefinition Width="*" MinWidth="10" />
-                            <ColumnDefinition Width="Auto" />
-                        </Grid.ColumnDefinitions>
-                        <Grid.RowDefinitions>
-                            <RowDefinition Height="Auto" />
-                            <!-- spacer -->
-                            <RowDefinition Height="2" />
-                            <RowDefinition Height="Auto" />
-                        </Grid.RowDefinitions>
-
-                        <!-- The name of the node. -->
-                        <TextBlock
-                            Grid.Column="0"
-                            Grid.ColumnSpan="3"
-                            Grid.Row="0"
-                            Text="{Binding Name}"
-                            HorizontalAlignment="Center"
-                            VerticalAlignment="Center"
-                            />
-
-                        <!-- Displays the node's input connectors. -->
-                        <ItemsControl
-                            Grid.Column="0"
-                            Grid.Row="2"
-                            ItemsSource="{Binding InputConnectors}"
-                            ItemTemplate="{StaticResource inputConnectorTemplate}"
-                            Focusable="False"
-                            />
-
-                        <!-- Displays the node's output connectors. -->
-                        <ItemsControl
-                            Grid.Column="2"
-                            Grid.Row="2"
-                            ItemsSource="{Binding OutputConnectors}"
-                            ItemTemplate="{StaticResource outputConnectorTemplate}"
-                            Focusable="False"
-                            />
-                    </Grid>
-                </Grid>
-            </DataTemplate>
-
-        </ResourceDictionary>
-    </Window.Resources>
-
-    <!--
-    Embed a zoom and pan control.
-    This is used so that we can scale the content to fit the overview window,
-    therefore we see an overview of all of the content at once.
-    -->
-    <ZoomAndPan:ZoomAndPanControl
-        x:Name="overview"
-        Background="LightGray"
-        Loaded="overview_Loaded"
-        SizeChanged="overview_SizeChanged"
-        >
-
-        <!-- 
-        This is the content that is displayed.
-        -->
-        <Grid
-            Width="{Binding ContentWidth}"
-            Height="{Binding ContentHeight}"
-            >
-
-            <!--
-            In this sample the NetworkView is the content displayed by the ZoomAndPanControl.
-            -->
-            <NetworkUI:NetworkView
-                x:Name="networkControl"
-                NodesSource="{Binding Network.Nodes}"
-                ConnectionsSource="{Binding Network.Connections}"
-                BorderBrush="Blue"
-                BorderThickness="1"
-                IsHitTestVisible="False"
-                />
-
-            <!--
-            This Canvas and Border are used to draw the 'overview' zoom rect. 
-            This show the area of the content that is being viewed in the main window.
-            -->
-            <Canvas>
-                <Thumb
-                    x:Name="overviewZoomRectThumb"
-                    Canvas.Left="{Binding ContentOffsetX, Mode=TwoWay}"
-                    Canvas.Top="{Binding ContentOffsetY, Mode=TwoWay}"
-                    Width="{Binding ContentViewportWidth}"
-                    Height="{Binding ContentViewportHeight}"
-                    DragDelta="overviewZoomRectThumb_DragDelta"
-                    Opacity="0.5"
-                    >
-                    <Thumb.Template>
-                        <ControlTemplate 
-                            TargetType="{x:Type Thumb}"
-                            >
-
-                            <Border 
-                                BorderBrush="Black"
-                                BorderThickness="1"
-                                Background="Yellow"
-                                CornerRadius="1"                                        
-                                />
-
-                        </ControlTemplate>
-                    </Thumb.Template>
-                </Thumb>
-            </Canvas>
-
-        </Grid>
-    </ZoomAndPan:ZoomAndPanControl>
-
-</Window>
diff --git a/ANAConversationStudio/Views/OverviewWindow.xaml.cs b/ANAConversationStudio/Views/OverviewWindow.xaml.cs
deleted file mode 100644
index da3243c..0000000
--- a/ANAConversationStudio/Views/OverviewWindow.xaml.cs
+++ /dev/null
@@ -1,84 +0,0 @@
-using System;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Input;
-using System.Windows.Controls.Primitives;
-using ANAConversationStudio.ViewModels;
-
-namespace ANAConversationStudio.Views
-{
-    /// <summary>
-    /// Interaction logic for OverviewWindow.xaml
-    /// </summary>
-    public partial class OverviewWindow : Window
-    {
-        public OverviewWindow()
-        {
-            InitializeComponent();
-        }
-
-        /// <summary>
-        /// Convenient accessor for the view-model.
-        /// </summary>
-        public MainWindowViewModel ViewModel
-        {
-            get
-            {
-                return (MainWindowViewModel)DataContext;
-            }
-        }
-
-        /// <summary>
-        /// Event raised when the ZoomAndPanControl is loaded.
-        /// </summary>
-        private void overview_Loaded(object sender, RoutedEventArgs e)
-        {
-            //
-            // Update the scale so that the entire content fits in the window.
-            //
-            overview.ScaleToFit();
-        }
-
-        /// <summary>
-        /// Event raised when the size of the ZoomAndPanControl changes.
-        /// </summary>
-        private void overview_SizeChanged(object sender, SizeChangedEventArgs e)
-        {
-            //
-            // Update the scale so that the entire content fits in the window.
-            //
-            overview.ScaleToFit();
-        }
-
-        /// <summary>
-        /// Event raised when the user drags the overview zoom rect.
-        /// </summary>
-        private void overviewZoomRectThumb_DragDelta(object sender, DragDeltaEventArgs e)
-        {
-            //
-            // Update the position of the overview rect as the user drags it around.
-            //
-            double newContentOffsetX = Math.Min(Math.Max(0.0, Canvas.GetLeft(overviewZoomRectThumb) + e.HorizontalChange), this.ViewModel.ContentWidth - this.ViewModel.ContentViewportWidth);
-            Canvas.SetLeft(overviewZoomRectThumb, newContentOffsetX);
-
-            double newContentOffsetY = Math.Min(Math.Max(0.0, Canvas.GetTop(overviewZoomRectThumb) + e.VerticalChange), this.ViewModel.ContentHeight - this.ViewModel.ContentViewportHeight);
-            Canvas.SetTop(overviewZoomRectThumb, newContentOffsetY);
-        }
-
-        /// <summary>
-        /// Event raised on mouse down.
-        /// </summary>
-        private void Window_MouseDown(object sender, MouseButtonEventArgs e)
-        {
-            //
-            // Update the position of the overview rect to the point that was clicked.
-            //
-            Point clickedPoint = e.GetPosition(networkControl);
-            double newX = clickedPoint.X - (overviewZoomRectThumb.Width / 2);
-            double newY = clickedPoint.Y - (overviewZoomRectThumb.Height / 2);
-            Canvas.SetLeft(overviewZoomRectThumb, newX);
-            Canvas.SetTop(overviewZoomRectThumb, newY);
-        }
-
-    }
-}
diff --git a/ANAConversationStudio/Views/SaveChatServersManager.xaml b/ANAConversationStudio/Views/SaveChatServersManager.xaml
new file mode 100644
index 0000000..682e20d
--- /dev/null
+++ b/ANAConversationStudio/Views/SaveChatServersManager.xaml
@@ -0,0 +1,31 @@
+<Window x:Class="ANAConversationStudio.Views.SaveChatServersManager"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        mc:Ignorable="d"
+        Closing="Window_Closing"
+        Title="Chat Server Connection Manager" Height="600" Width="800" WindowStyle="ToolWindow">
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition/>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>
+        </Grid.RowDefinitions>
+        <xctk:CollectionControl Margin="10" x:Name="CollectionControl"/>
+        <!--<TextBlock Grid.Row="1" Text="Note: First connection will be the default connection and is loaded automatically. Use 'Up' and 'Down' arrows to re-order the connections." Margin="10,0"/>-->
+        <StackPanel Grid.Row="2" Margin="5" Orientation="Horizontal" HorizontalAlignment="Center">
+            <StackPanel.Resources>
+                <Style TargetType="Button" BasedOn="{StaticResource {x:Type Button}}">
+                    <Setter Property="Margin" Value="5"/>
+                    <Setter Property="Padding" Value="5"/>
+                    <Setter Property="MinWidth" Value="100"/>
+                </Style>
+            </StackPanel.Resources>
+            <!--<Button Content="Save and Close" Click="SaveClick"/>-->
+            <Button Content="Save and connect selected" Click="SaveAndConnectClick" IsEnabled="{Binding ElementName=CollectionControl, Path=SelectedItem, Converter={StaticResource N2B}}"/>
+            <Button Content="Cancel" Click="CancelClick"/>
+        </StackPanel>
+    </Grid>
+</Window>
diff --git a/ANAConversationStudio/Views/SaveChatServersManager.xaml.cs b/ANAConversationStudio/Views/SaveChatServersManager.xaml.cs
new file mode 100644
index 0000000..d687092
--- /dev/null
+++ b/ANAConversationStudio/Views/SaveChatServersManager.xaml.cs
@@ -0,0 +1,98 @@
+using ANAConversationStudio.Helpers;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.ComponentModel;
+using System.Linq;
+using System.Windows;
+
+namespace ANAConversationStudio.Views
+{
+    public partial class SaveChatServersManager : Window
+    {
+        public SaveChatServersManager()
+        {
+            InitializeComponent();
+
+            CollectionControl.ItemsSource = Utilities.Settings.SavedChatServerConnections.DeepCopy();
+            CollectionControl.ItemsSourceType = typeof(ObservableCollection<ChatServerConnection>);
+            CollectionControl.NewItemTypes = new List<Type>() { typeof(ChatServerConnection) };
+        }
+
+        private void Window_Closing(object sender, CancelEventArgs e)
+        {
+            if (HideConfirm) return;
+
+            var op = MessageBox.Show("Save changes and exit?", "Hold on!", MessageBoxButton.YesNoCancel);
+            if (op == MessageBoxResult.Yes)
+            {
+                Save();
+                HideConfirm = true;
+                if (MainWindow.Current != null)
+                    MainWindow.Current.AskAlert = false;
+                Application.Current.Shutdown();
+            }
+            else if (op == MessageBoxResult.No)
+            {
+                HideConfirm = true;
+                if (MainWindow.Current != null)
+                    MainWindow.Current.AskAlert = false;
+                Application.Current.Shutdown();
+            }
+        }
+        private bool HideConfirm = false;
+
+        private bool Save()
+        {
+            var conns = CollectionControl.Items.Cast<ChatServerConnection>().ToList();
+
+            if (conns.Any(x => !x.IsValid()))
+            {
+                MessageBox.Show("The following connections are invalid, please correct them: \r\n" + string.Join("\r\n", conns.Where(x => !x.IsValid())), "Oops!");
+                return false;
+            }
+            Utilities.Settings.SavedChatServerConnections = conns;
+            Utilities.Settings.Save(App.Cryptio);
+            return true;
+        }
+
+        private void CancelClick(object sender, RoutedEventArgs e)
+        {
+            HideConfirm = true;
+            Application.Current.Shutdown();
+        }
+
+        private async void SaveAndConnectClick(object sender, RoutedEventArgs e)
+        {
+            var conn = (CollectionControl.SelectedItem as ChatServerConnection);
+            if (conn != null)
+            {
+                try
+                {
+                    if (!conn.IsValid())
+                    {
+                        MessageBox.Show("The connection details are invalid. Please correct them and try again.", "Oops!");
+                        return;
+                    }
+                    var done = await StudioContext.LoadFromChatServerConnectionAsync(conn);
+                    if (!done) return;
+                    if (Save())
+                    {
+                        HideConfirm = true;
+                        Close();
+                    }
+                }
+                catch (Exception ex)
+                {
+                    StudioContext.Current = null;
+                    MessageBox.Show("Unable to connect to the chat server");
+                }
+            }
+        }
+    }
+}
+
+//var connected = MainWindow.Current.ViewModel.LoadNodes();
+//                    if (connected)
+//                    {
+//                        MainWindow.Current.Status("Chat flow loaded");
diff --git a/ANAConversationStudio/Views/SetPassword.xaml b/ANAConversationStudio/Views/SetPassword.xaml
index f16a28d..5276e77 100644
--- a/ANAConversationStudio/Views/SetPassword.xaml
+++ b/ANAConversationStudio/Views/SetPassword.xaml
@@ -6,7 +6,7 @@
         xmlns:local="clr-namespace:ANAConversationStudio.Views"
         xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
         mc:Ignorable="d"
-        Title="ANA Conversation Studio - Password Setup" Height="200" Width="300" MinHeight="200" MinWidth="300" Icon="/ANAConversationStudio;component/favicon.ico" WindowStartupLocation="CenterScreen">
+        Title="ANA Conversation Studio - Password Setup" Height="200" Width="350" MinHeight="200" MinWidth="300" Icon="/ANAConversationStudio;component/favicon.ico" WindowStartupLocation="CenterScreen">
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition />
diff --git a/ANAConversationStudio/Views/SettingsWindow.xaml b/ANAConversationStudio/Views/SettingsWindow.xaml
index b3e4b75..74b0ed2 100644
--- a/ANAConversationStudio/Views/SettingsWindow.xaml
+++ b/ANAConversationStudio/Views/SettingsWindow.xaml
@@ -4,7 +4,6 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
-        xmlns:local="clr-namespace:ANAConversationStudio.Views"
         mc:Ignorable="d"
         Title="Settings" Height="500" Width="600">
     <Grid>
@@ -12,7 +11,7 @@
             <RowDefinition />
             <RowDefinition Height="Auto"/>
         </Grid.RowDefinitions>
-        <xctk:PropertyGrid Margin="10" x:Name="SettingsEditor" SelectedObject="{Binding Config}"/>
+        <xctk:PropertyGrid x:Name="SettingsEditor" SelectedObject="{Binding Config}"/>
         <Button Content="Save" Click="SaveClick" Grid.Row="1" Margin="10" HorizontalAlignment="Center" Padding="30,5"/>
     </Grid>
 </Window>
diff --git a/ANAConversationStudio/packages.config b/ANAConversationStudio/packages.config
index a988ca0..8a7ae0c 100644
--- a/ANAConversationStudio/packages.config
+++ b/ANAConversationStudio/packages.config
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Extended.Wpf.Toolkit" version="3.0" targetFramework="net45" />
-  <package id="MongoDB.Bson" version="2.4.3" targetFramework="net45" />
-  <package id="MongoDB.Driver" version="2.4.3" targetFramework="net45" />
-  <package id="MongoDB.Driver.Core" version="2.4.3" targetFramework="net45" />
-  <package id="Newtonsoft.Json" version="10.0.2" targetFramework="net45" />
-  <package id="Serilog" version="2.4.0" targetFramework="net45" />
+  <package id="Extended.Wpf.Toolkit" version="3.1" targetFramework="net45" />
+  <package id="MaterialDesignColors" version="1.1.3" targetFramework="net45" />
+  <package id="MaterialDesignThemes" version="2.3.0.823" targetFramework="net45" />
+  <package id="MongoDB.Bson" version="2.4.4" targetFramework="net45" />
+  <package id="MongoDB.Driver" version="2.4.4" targetFramework="net45" />
+  <package id="MongoDB.Driver.Core" version="2.4.4" targetFramework="net45" />
+  <package id="Newtonsoft.Json" version="10.0.3" targetFramework="net45" />
+  <package id="Serilog" version="2.5.0" targetFramework="net45" />
   <package id="Serilog.Sinks.File" version="3.2.0" targetFramework="net45" />
   <package id="Serilog.Sinks.RollingFile" version="3.3.0" targetFramework="net45" />
   <package id="System.Runtime.InteropServices.RuntimeInformation" version="4.3.0" targetFramework="net45" />
diff --git a/ANAConversationSuite.sln b/ANAConversationSuite.sln
index 82ef784..725685e 100644
--- a/ANAConversationSuite.sln
+++ b/ANAConversationSuite.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.26430.12
+VisualStudioVersion = 15.0.26430.16
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANAConversationStudio", "ANAConversationStudio\ANAConversationStudio.csproj", "{964D06C1-81E3-438D-9DCE-CFA8FB87F04D}"
 EndProject
@@ -16,6 +16,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 EndProject
 Project("{9092AA53-FB77-4645-B42D-1CCCA6BD08BD}") = "LiveClientSocketsManager", "LiveClientSocketsManager\LiveClientSocketsManager.njsproj", "{B43F2F05-9680-4749-BB5E-29AF01B08B11}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Assets", "Assets", "{0D4612DF-0B2B-4801-A0A0-136641B54E4C}"
+	ProjectSection(SolutionItems) = preProject
+		Assets\anaflow.png = Assets\anaflow.png
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
diff --git a/Assets/anaflow.png b/Assets/anaflow.png
new file mode 100644
index 0000000..92e312c
Binary files /dev/null and b/Assets/anaflow.png differ
diff --git a/ExternalBinaries/NetworkUI.dll b/ExternalBinaries/NetworkUI.dll
index a92663e..4fb14ee 100644
Binary files a/ExternalBinaries/NetworkUI.dll and b/ExternalBinaries/NetworkUI.dll differ
diff --git a/README.MD b/README.MD
index e4cd88c..1bd78da 100644
--- a/README.MD
+++ b/README.MD
@@ -13,7 +13,7 @@ Web & Messenger SDK
 
 ----------
 
-[![Studio and Simulator Image](https://s3-ap-southeast-1.amazonaws.com/nfcontent-cdn/public-assets/github/ProjectANA/ANA-Studio-Simulator.jpg)](https://s3-ap-southeast-1.amazonaws.com/nfcontent-cdn/public-assets/github/ProjectANA/ANA-Studio-Simulator.jpg)
+[![Studio and Simulator Image](https://github.com/Kitsune-tools/ProjectANA/blob/master/Assets/anaflow.png)](https://github.com/Kitsune-tools/ProjectANA/blob/master/Assets/anaflow.png)
 
 ----------
 
@@ -42,31 +42,28 @@ Web & Messenger SDK
 2.  In ANA Conversation Platform project, open appsettings-Sample.json and edit DatabaseConnectionSettings section to match your MongoDB details.
 3.  Change Collection names to new/empty collections.
 4.  Save and Rename appsettings-Sample.json to appsettings.json
-4.  Build and publish the project to the server as usual. It's an ASP.NET Core 1.1 project, which can be hosted on Windows, Linux and Mac.
+5.  Build and publish the project to the server as usual. It's an ASP.NET Core 1.1 project, which can be hosted on Windows, Linux and Mac.
+6.  Note down the base URL of your hosted project.
+7.  Optionally, Set the APIKey and APISecret in appsettings.json under BasicAuth section for security.
 
 **Setup Studio:**
 
-1.  Build the ANA Conversation Studio project yourself or download the binary directly. Open the exe once done.
-2.  Add the details of the same collections and MongoDB connection string used in the Platform Setup in (File -> Manage Connections->Add. Click 'Save and close'.
-3.  An additional MongoDB Collection name is asked as "LayoutCollectionName", this should be a new/empty collection.
-3.  To create a sample chat flow, right click on the studio document(white area) and click 'Create new node'.
-    1.  Add buttons and sections to it using the Node Editor and Section Button Editor. Also, add content to each button and section you have added with the help of Content Editor.
-    2.  Set the 'IsStartNode' of the Node to 'true'.
+1.  Build the ANA Conversation Studio project yourself or download the binary directly from releases section. Open the exe once done.
+2.  Enter the above noted chat server base URL, APIKey and APISecret (if you have set them) in the 'Chat Server Connection Manager' Window which appears, by clicking on 'Add' button present in the top center of the window.
+3.  As soon as you are connected to the chat server, your first project will be created and loaded for you. 
+4.  To create a sample chat flow, right click on the studio document(white area) and click 'Create new node'.
+    1.  Add sections and buttons to it by double clicking it.
+    2.  Check the 'Mark as start node' check box of the node. 
 3.  Save the flow.
 
 **Setup Simulator:**
 
 1.  To build the ANA Conversation Simulator project, you will need Visual Studio 2017 + UWP SDK.
-2.  Already built app package is also provided in releases section. Download, extract and run the .ps1 script as admin using PowerShell. That will install the Simulator into your system as a Windows 10 App. *Developer mode* should be turned on on your PC.
-3.  Open the app by searching in the Start Menu or from ANA Conversation Studio->Tools->Launch ANA Conversation Simulator.
-4.  First time of the launch, you will be asked for the Chat and UploadFile APIs. Edit it to match the URL of your hosted ANA Conversation Platform.
-5.  If everything went as it should, your chat should have started and you should see the content of the first node -> first section.
+2.  Already built app package is also provided in releases section. Download, extract and run the .ps1 script as admin using PowerShell. That will install the Simulator into your system as a Windows 10 App. *Developer mode* should be turned on in your PC.
+3.  You can launch the flow in the simulator directly from the studio by going to ANA Conversation Studio -> Tools -> Launch Current Chat in Simulator option, or by just pressing the F5 button. This will fill the chat flow API directly and lets the chat flow start directly without any manual effort.
+4.  If everything went as it should, your chat should have started and you should see the content of the first node -> first section.
+5.  Additional chat server related configurations can be done in top right menu -> Configure Chat Server.
 6.  If you choose to build the app instead of using the built package, obtain your own MapToken required by the UWP Map Control from your developer.microsoft.com account and place it in Config-Sample.json. Then rename the file to Config.json and build the project.
-
-**Creating your first flow**
-
-[![ProjectANA Sample Chat Flow](https://s3-ap-southeast-1.amazonaws.com/nfcontent-cdn/public-assets/github/ProjectANA/ProjectANA-Sample-Chat-Flow.gif)](https://s3-ap-southeast-1.amazonaws.com/nfcontent-cdn/public-assets/github/ProjectANA/ProjectANA-Sample-Chat-Flow.gif)
-
 ----------
 
 ## Agent Chat