diff --git a/Areas/Identity/Pages/Account/Register.cshtml b/Areas/Identity/Pages/Account/Register.cshtml
index a26269a..de7fa73 100644
--- a/Areas/Identity/Pages/Account/Register.cshtml
+++ b/Areas/Identity/Pages/Account/Register.cshtml
@@ -32,6 +32,11 @@
                 <label asp-for="Input.LastName"></label>
                 <span asp-validation-for="Input.LastName" class="text-danger"></span>
             </div>
+            <div class="form-floating">
+                <input asp-for="Input.PhoneNumber" class="form-control" aria-required="true" />
+                <label asp-for="Input.PhoneNumber"></label>
+                <span asp-validation-for="Input.PhoneNumber" class="text-danger"></span>
+            </div>
             <div class="form-floating">
                 <select asp-for="Input.Gender">
                     <option value="M">Male</option>
@@ -60,6 +65,7 @@
                 <label asp-for="Input.DoctorUID" style="display:none;"></label>
                 <span asp-validation-for="Input.DoctorUID" class="text-danger"></span>
             </div>
+            <div class="g-recaptcha" data-sitekey="@ViewData["ReCaptchaKey"]"></div>
             <button id="registerSubmit" type="submit" class="w-100 btn btn-lg btn-primary">Register</button>
         </form>
     </div>
@@ -112,4 +118,5 @@
             })
         })
     </script>
+    <script src='https://www.google.com/recaptcha/api.js'></script>
 }
diff --git a/Areas/Identity/Pages/Account/Register.cshtml.cs b/Areas/Identity/Pages/Account/Register.cshtml.cs
index f135183..877bbe7 100644
--- a/Areas/Identity/Pages/Account/Register.cshtml.cs
+++ b/Areas/Identity/Pages/Account/Register.cshtml.cs
@@ -24,6 +24,14 @@
 using DoctorSystem.Data;
 using DoctorSystem.Data.Migrations;
 using Microsoft.Extensions.Hosting;
+using DoctorSystem.Misc;
+using Newtonsoft.Json.Linq;
+using System.Net;
+using DoctorSystem.Singleton;
+using Microsoft.Extensions.Options;
+
+//using Microsoft.Extensions.Configuration;
+//using Microsoft.Extensions.Configuration.Json;
 
 namespace DoctorSystem.Areas.Identity.Pages.Account
 {
@@ -38,8 +46,10 @@ public class RegisterModel : PageModel
         private readonly RoleManager<IdentityRole> _roleManager;
         private readonly ApplicationDbContext _context;
 
+        private readonly Config _config;
 
         public RegisterModel(
+            IOptions<Config> config,
             UserManager<DefaultUser> userManager,
             IUserStore<DefaultUser> userStore,
             SignInManager<DefaultUser> signInManager,
@@ -48,6 +58,7 @@ public RegisterModel(
             RoleManager<IdentityRole> roleManager,
             ApplicationDbContext context)
         {
+            _config = config.Value;
             _context = context;
             _roleManager = roleManager;
             _userManager = userManager;
@@ -83,7 +94,7 @@ public RegisterModel(
         /// </summary>
         public class InputModel
         {
-            [Display(Name = "Doctor UID")]
+            [Display(Name = "Doctor UIN")]
             public string DoctorUID { get; set; }
             
             [Display(Name = "Birth Date")]
@@ -98,6 +109,11 @@ public class InputModel
 
             [Display(Name = "Gender")]
             public string Gender { get; set; }
+
+            [Phone]
+            [Display(Name = "Telephone Number")]
+            public string PhoneNumber { get; set; }
+
             /// <summary>
             ///     This API supports the ASP.NET Core Identity default UI infrastructure and is not intended to be used
             ///     directly from your code. This API may change or be removed in future releases.
@@ -137,27 +153,41 @@ public async Task OnGetAsync(string returnUrl = null)
         {
             ReturnUrl = returnUrl;
             ExternalLogins = (await _signInManager.GetExternalAuthenticationSchemesAsync()).ToList();
-        
+            ViewData["ReCaptchaKey"] = _config.CaptchaKey;
+
         }
 
         public async Task<IActionResult> OnPostAsync(string returnUrl = null)
         {
             returnUrl ??= Url.Content("~/");
             ExternalLogins = (await _signInManager.GetExternalAuthenticationSchemesAsync()).ToList();
+            ViewData["ReCaptchaKey"] = _config.CaptchaKey;
+
             if (ModelState.IsValid)
             {
+                if (!ReCaptchaPassed(
+                    Request.Form["g-recaptcha-response"],                      
+                    _config.CaptchaSecret,
+                    _logger
+                ))
+                {
+                    ModelState.AddModelError(string.Empty, "Go home, Robot, Go home. You failed our Captcha.");
+                    return Page();
+                }
+
                 var user = CreateUser();
                 user.DateOfBirth = Input.DateOfBirth;
                 user.FirstName = Input.FirstName;
                 user.LastName = Input.LastName;
                 user.Gender = Input.Gender;
-                if (Input.Role == "Patient")
+                user.PhoneNumber = Input.PhoneNumber;
+                if (Input.Role == Role.Patient)
                 {
-                    await _userManager.AddToRoleAsync(user, "Patient");
+                    await _userManager.AddToRoleAsync(user, Role.Patient);
                 }
                 else
                 {
-                    await _userManager.AddToRoleAsync(user, "Guest");
+                    await _userManager.AddToRoleAsync(user, Role.Guest);
                     user.DoctorUID = Input.DoctorUID;
                 }
 
@@ -180,16 +210,16 @@ public async Task<IActionResult> OnPostAsync(string returnUrl = null)
                 {
                     if (Input.Role == null)
                     {
-                        await _userManager.AddToRoleAsync(user, "Guest");
+                        await _userManager.AddToRoleAsync(user, Role.Guest);
                     }
                     else
                     {
-                        if (Input.Role != "Doctor")
+                        if (Input.Role != Role.Doctor)
                         {
                             await _userManager.AddToRoleAsync(user, Input.Role);
 
                         }
-                        await _userManager.AddToRoleAsync(user, "Guest");
+                        await _userManager.AddToRoleAsync(user, Role.Guest);
                     }
                     _logger.LogInformation("User created a new account with password.");
 
@@ -247,5 +277,25 @@ private IUserEmailStore<DefaultUser> GetEmailStore()
             }
             return (IUserEmailStore<DefaultUser>)_userStore;
         }
+
+        public static bool ReCaptchaPassed(string gRecaptchaResponse, string secret, ILogger logger)
+        {
+            HttpClient httpClient = new HttpClient();
+            var res = httpClient.GetAsync($"https://www.google.com/recaptcha/api/siteverify?secret={secret}&response={gRecaptchaResponse}").Result;
+            if (res.StatusCode != HttpStatusCode.OK)
+            {
+                logger.LogError("Error while sending request to ReCaptcha");
+                return false;
+            }
+
+            string JSONres = res.Content.ReadAsStringAsync().Result;
+            dynamic JSONdata = JObject.Parse(JSONres);
+            if (JSONdata.success != "true")
+            {
+                return false;
+            }
+
+            return true;
+        }
     }
 }
diff --git a/Controllers/PostingController.cs b/Controllers/PostingController.cs
deleted file mode 100644
index 19f1388..0000000
--- a/Controllers/PostingController.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using DoctorSystem.Models;
-using Microsoft.AspNetCore.Mvc;
-
-namespace DoctorSystem.Controllers
-{
-    public class PostingController : Controller
-    {
-        public IActionResult Index()
-        {
-            return View();
-        }
-
-        public IActionResult Post()
-        {
-            return View("CreatePost");
-        }
-        [HttpPost]
-        public IActionResult Post(Posts post)
-        {
-            return View("Created", post);
-        }
-
-    }
-}
diff --git a/Controllers/PostsController.cs b/Controllers/PostsController.cs
index a45a937..74cfdb0 100644
--- a/Controllers/PostsController.cs
+++ b/Controllers/PostsController.cs
@@ -9,6 +9,11 @@
 using DoctorSystem.Models;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Identity;
+using DoctorSystem.Data.Migrations;
+using Category = DoctorSystem.Models.Category;
+using Post = DoctorSystem.Models.Post;
+using DoctorSystem.Misc;
+using Microsoft.Extensions.Hosting;
 
 namespace DoctorSystem.Controllers
 {
@@ -28,13 +33,32 @@ public PostsController(ApplicationDbContext context, UserManager<DefaultUser> us
             _userManager = userManager;
         }
 
-        //[Authorize(Roles = "Doctor")]
-        // GET: Posts
-        public async Task<IActionResult> Index()
+        public ViewResult Index(string searchString)
         {
-              return View(await _context.Post.Include(p => p.Comments).ToListAsync());
+            var str = _context.Post
+                        .Include(p => p.Comments)
+                        .ThenInclude(x => x.Creator)
+                        .Include(t => t.Creator)
+                        .OrderByDescending(s => s.DateCreated)
+                        .Include(v => v.Category).ToList();
+            if (User.IsInRole(Role.Doctor))
+            {
+                if (!String.IsNullOrEmpty(searchString))
+                {
+                    return View(str.Where(s => s.Category.Name == searchString));
+                }
+                return View(str);
+            }
+            else
+            {
+                if (!String.IsNullOrEmpty(searchString))
+                {
+                    return View(str.Where(s => s.Creator.Email == User.Identity.Name)
+                        .Where(s => s.Category.Name == searchString));
+                }
+                return View(str.Where(s => s.Creator.Email == User.Identity.Name));
+            }
         }
-
         // GET: Posts/Details/5
         public async Task<IActionResult> Details(int? id)
         {
@@ -43,20 +67,44 @@ public async Task<IActionResult> Details(int? id)
                 return NotFound();
             }
 
-            var post = await _context.Post
+            var post = await _context.Post.Include(p=>p.Comments).ThenInclude(c=>c.Creator)
                 .FirstOrDefaultAsync(m => m.Id == id);
             if (post == null)
             {
                 return NotFound();
             }
-            var comment = await _context.Comment.ToListAsync();
-            return View(post);
+
+            var res = new PostDetailViewModel()
+            {
+                Post = post,
+                PostId = post.Id,
+            };
+            return View(res);
+
+        }
+        public async Task<IActionResult> CreateComment(PostDetailViewModel res, Comment comment)
+        {
+            comment.Creator = await _userManager.GetUserAsync(User);
+            comment.Post = await _context.Post.FindAsync(res.PostId);
+            comment.CreatedAt = DateTime.Now;
+            comment.Text = res.Text;
+
+            _context.Add(comment);
+            await _context.SaveChangesAsync();
+            return RedirectToAction("Index");
         }
 
         //[Authorize(Roles = "Patient")]
         // GET: Posts/Create
         public IActionResult Create()
         {
+            IEnumerable<SelectListItem> CategoryList = _context.Category.Select(
+                u => new SelectListItem
+                {
+                    Text = u.Name,
+                    Value = u.Id.ToString()
+                });
+            ViewBag.CategoryList = CategoryList;
             return View();
         }
 
@@ -65,8 +113,11 @@ public IActionResult Create()
         // For more details, see http://go.microsoft.com/fwlink/?LinkId=317598.
         [HttpPost]
         [ValidateAntiForgeryToken]
-        public async Task<IActionResult> Create([Bind("Id,Title,Description,DateCreated")] Post post)
+        public async Task<IActionResult> Create([Bind("Id,Title,Description,DateCreated,CategoryId")] Post post)
         {
+            ViewData["CategoryId"] = new SelectList(_context.Category, "Id", "Name", post.CategoryId);
+            post.Category = await _context.FindAsync<Category>(post.CategoryId);
+            ModelState.Remove("Category");
             post.Creator = await _userManager.GetUserAsync(User);
             post.DateCreated = DateTime.Now;
             if (ModelState.IsValid)
@@ -75,6 +126,7 @@ public async Task<IActionResult> Create([Bind("Id,Title,Description,DateCreated"
                 await _context.SaveChangesAsync();
                 return RedirectToAction(nameof(Index));
             }
+            //ViewBag.CategoryList = CategoryList;
             return View(post);
         }
 
@@ -85,7 +137,6 @@ public async Task<IActionResult> Edit(int? id)
             {
                 return NotFound();
             }
-
             var post = await _context.Post.FindAsync(id);
             if (post == null)
             {
@@ -105,7 +156,6 @@ public async Task<IActionResult> Edit(int id, [Bind("Id,Title,Description,DateCr
             {
                 return NotFound();
             }
-
             if (ModelState.IsValid)
             {
                 try
@@ -166,10 +216,102 @@ public async Task<IActionResult> DeleteConfirmed(int id)
             return RedirectToAction(nameof(Index));
         }
 
+        public async Task<IActionResult> EditComment(int? id)
+        {
+            if (id == null || _context.Comment == null)
+            {
+                return NotFound();
+            }
+
+            var comment = await _context.Comment.FindAsync(id);
+            if (comment == null)
+            {
+                return NotFound();
+            }
+            ViewData["PostId"] = new SelectList(_context.Post, "Id", "Description", comment.PostId);
+            return View(comment);
+        }
+
+        // POST: Comments/Edit/5
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        public async Task<IActionResult> EditComment(int id, [Bind("Id,PostId,CreatedAt,Text")] Comment comment)
+        {
+            if (id != comment.Id)
+            {
+                return NotFound();
+            }
+
+            if (ModelState.IsValid)
+            {
+                try
+                {
+                    _context.Update(comment);
+                    await _context.SaveChangesAsync();
+                }
+                catch (DbUpdateConcurrencyException)
+                {
+                    if (!CommentExists(comment.Id))
+                    {
+                        return NotFound();
+                    }
+                    else
+                    {
+                        throw;
+                    }
+                }
+                return RedirectToAction(nameof(Index));
+            }
+            ViewData["PostId"] = new SelectList(_context.Post, "Id", "Description", comment.PostId);
+            return View(comment);
+        }
+
+        public async Task<IActionResult> DeleteComment(int? id)
+        {
+            if (id == null || _context.Comment == null)
+            {
+                return NotFound();
+            }
+
+            var comment = await _context.Comment
+                .Include(c => c.Post)
+                .FirstOrDefaultAsync(m => m.Id == id);
+            if (comment == null)
+            {
+                return NotFound();
+            }
+
+            return View(comment);
+        }
+
+        // POST: Comments/Delete/5
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        public async Task<IActionResult> DeleteCommentConfirmed(int id)
+        {
+            if (_context.Comment == null)
+            {
+                return Problem("Entity set 'ApplicationDbContext.Comment'  is null.");
+            }
+            var comment = await _context.Comment.FindAsync(id);
+            if (comment != null)
+            {
+                _context.Comment.Remove(comment);
+            }
+
+            await _context.SaveChangesAsync();
+            return RedirectToAction(nameof(Index));
+        }
+
         private bool PostExists(int id)
         {
           return _context.Post.Any(e => e.Id == id);
         }
 
+        private bool CommentExists(int id)
+        {
+            return _context.Comment.Any(e => e.Id == id);
+        }
     }
 }
+
diff --git a/Controllers/RoleRequestsController.cs b/Controllers/RoleRequestsController.cs
index a0c019a..5e0d1d1 100644
--- a/Controllers/RoleRequestsController.cs
+++ b/Controllers/RoleRequestsController.cs
@@ -9,6 +9,7 @@
 using DoctorSystem.Models;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Authorization;
+using DoctorSystem.Misc;
 
 namespace DoctorSystem.Controllers
 {
@@ -53,8 +54,8 @@ public async Task<IActionResult> Approve(int? id)
                 _context.Update(roleRequest);
                 await _context.SaveChangesAsync();
                 var user = await _userManager.FindByIdAsync(roleRequest.Requester.Id);
-                await _userManager.AddToRoleAsync(user, "Doctor");
-                await _userManager.RemoveFromRoleAsync(user, "Guest");
+                await _userManager.AddToRoleAsync(user, Role.Doctor);
+                await _userManager.RemoveFromRoleAsync(user, Role.Guest);
 
             }
             catch (DbUpdateConcurrencyException)
@@ -107,7 +108,7 @@ public async Task<IActionResult> Edit(int id, [Bind("Id,DateCreated,IsApproved,D
                     _context.Update(roleRequest);
                     await _context.SaveChangesAsync();
                     var user = await _userManager.FindByIdAsync(roleRequest.UserId);
-                    await _userManager.AddToRoleAsync(user, "Doctor");
+                    await _userManager.AddToRoleAsync(user, Role.Doctor);
                     
                 }
                 catch (DbUpdateConcurrencyException)
diff --git a/Data/ApplicationDbContext.cs b/Data/ApplicationDbContext.cs
index bafc83f..ce36598 100644
--- a/Data/ApplicationDbContext.cs
+++ b/Data/ApplicationDbContext.cs
@@ -14,6 +14,7 @@ public ApplicationDbContext(DbContextOptions<ApplicationDbContext> options)
         public DbSet<Post> Post { get; set; }
         public DbSet<Comment> Comment { get; set; }
         public DbSet<RoleRequest> RoleRequests { get; set; }
+        public DbSet<Category> Category { get; set; }
 
 
 
diff --git a/Data/DbInitializer.cs b/Data/DbInitializer.cs
index d4ea145..3f055b4 100644
--- a/Data/DbInitializer.cs
+++ b/Data/DbInitializer.cs
@@ -1,4 +1,5 @@
 using Microsoft.AspNetCore.Identity;
+using DoctorSystem.Misc;
 
 namespace DoctorSystem.Data;
 public static class DbInitializer
@@ -12,26 +13,26 @@ public static void Initialize(ApplicationDbContext context)
         {
             context.Roles.Add(new IdentityRole
             {
-                Name = "Admin",
-                NormalizedName = "ADMIN"
+                Name = Role.Admin,
+                NormalizedName = Role.Admin.ToUpper(),
             });
 
             context.Roles.Add(new IdentityRole
             {
-                Name = "Guest",
-                NormalizedName = "GUEST"
+                Name = Role.Guest,
+                NormalizedName = Role.Guest.ToUpper(),
             });
 
             context.Roles.Add(new IdentityRole
             {
-                Name = "Patient",
-                NormalizedName = "PATIENT"
+                Name = Role.Patient,
+                NormalizedName = Role.Patient.ToUpper(),
             });
 
             context.Roles.Add(new IdentityRole
             {
-                Name = "Doctor",
-                NormalizedName = "DOCTOR"
+                Name = Role.Doctor,
+                NormalizedName = Role.Doctor.ToUpper(),
             });
             context.SaveChanges();
         }
diff --git a/Data/Migrations/20221213134819_Category.Designer.cs b/Data/Migrations/20221213134819_Category.Designer.cs
new file mode 100644
index 0000000..70ecb67
--- /dev/null
+++ b/Data/Migrations/20221213134819_Category.Designer.cs
@@ -0,0 +1,505 @@
+// <auto-generated />
+using System;
+using DoctorSystem.Data;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+
+#nullable disable
+
+namespace DoctorSystem.Data.Migrations
+{
+    [DbContext(typeof(ApplicationDbContext))]
+    [Migration("20221213134819_Category")]
+    partial class Category
+    {
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "6.0.10")
+                .HasAnnotation("Relational:MaxIdentifierLength", 128);
+
+            SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder, 1L, 1);
+
+            modelBuilder.Entity("DoctorSystem.Models.Category", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"), 1L, 1);
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Category");
+                });
+
+            modelBuilder.Entity("DoctorSystem.Models.Comment", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"), 1L, 1);
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("CreatorId")
+                        .HasColumnType("nvarchar(450)");
+
+                    b.Property<int>("PostId")
+                        .HasColumnType("int");
+
+                    b.Property<string>("Text")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("CreatorId");
+
+                    b.HasIndex("PostId");
+
+                    b.ToTable("Comment");
+                });
+
+            modelBuilder.Entity("DoctorSystem.Models.DefaultUser", b =>
+                {
+                    b.Property<string>("Id")
+                        .HasColumnType("nvarchar(450)");
+
+                    b.Property<int>("AccessFailedCount")
+                        .HasColumnType("int");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<DateTime?>("DateOfBirth")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("DoctorUID")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("Email")
+                        .HasMaxLength(256)
+                        .HasColumnType("nvarchar(256)");
+
+                    b.Property<bool>("EmailConfirmed")
+                        .HasColumnType("bit");
+
+                    b.Property<string>("FirstName")
+                        .HasMaxLength(250)
+                        .HasColumnType("nvarchar(250)");
+
+                    b.Property<string>("Gender")
+                        .HasMaxLength(250)
+                        .HasColumnType("nvarchar(250)");
+
+                    b.Property<string>("LastName")
+                        .HasMaxLength(250)
+                        .HasColumnType("nvarchar(250)");
+
+                    b.Property<bool>("LockoutEnabled")
+                        .HasColumnType("bit");
+
+                    b.Property<DateTimeOffset?>("LockoutEnd")
+                        .HasColumnType("datetimeoffset");
+
+                    b.Property<string>("NormalizedEmail")
+                        .HasMaxLength(256)
+                        .HasColumnType("nvarchar(256)");
+
+                    b.Property<string>("NormalizedUserName")
+                        .HasMaxLength(256)
+                        .HasColumnType("nvarchar(256)");
+
+                    b.Property<string>("PasswordHash")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("PhoneNumber")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<bool>("PhoneNumberConfirmed")
+                        .HasColumnType("bit");
+
+                    b.Property<string>("SecurityStamp")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<bool>("TwoFactorEnabled")
+                        .HasColumnType("bit");
+
+                    b.Property<string>("UserName")
+                        .HasMaxLength(256)
+                        .HasColumnType("nvarchar(256)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("NormalizedEmail")
+                        .HasDatabaseName("EmailIndex");
+
+                    b.HasIndex("NormalizedUserName")
+                        .IsUnique()
+                        .HasDatabaseName("UserNameIndex")
+                        .HasFilter("[NormalizedUserName] IS NOT NULL");
+
+                    b.ToTable("AspNetUsers", (string)null);
+                });
+
+            modelBuilder.Entity("DoctorSystem.Models.Post", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"), 1L, 1);
+
+                    b.Property<int>("CategoryId")
+                        .HasColumnType("int");
+
+                    b.Property<string>("CreatorId")
+                        .HasColumnType("nvarchar(450)");
+
+                    b.Property<DateTime>("DateCreated")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("Title")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("CategoryId");
+
+                    b.HasIndex("CreatorId");
+
+                    b.ToTable("Post");
+                });
+
+            modelBuilder.Entity("DoctorSystem.Models.RoleRequest", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"), 1L, 1);
+
+                    b.Property<DateTime>("DateCreated")
+                        .HasColumnType("datetime2");
+
+                    b.Property<bool>("IsApproved")
+                        .HasColumnType("bit");
+
+                    b.Property<string>("RequesterId")
+                        .HasColumnType("nvarchar(450)");
+
+                    b.Property<string>("RoleId")
+                        .HasColumnType("nvarchar(450)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("RequesterId");
+
+                    b.HasIndex("RoleId");
+
+                    b.ToTable("RoleRequests");
+                });
+
+            modelBuilder.Entity("DoctorSystem.Models.UserFriendship", b =>
+                {
+                    b.Property<string>("UserId")
+                        .HasColumnType("nvarchar(450)");
+
+                    b.Property<string>("UserFriendId")
+                        .HasColumnType("nvarchar(450)");
+
+                    b.HasKey("UserId", "UserFriendId");
+
+                    b.HasIndex("UserFriendId");
+
+                    b.ToTable("UserFriendship");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRole", b =>
+                {
+                    b.Property<string>("Id")
+                        .HasColumnType("nvarchar(450)");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("Name")
+                        .HasMaxLength(256)
+                        .HasColumnType("nvarchar(256)");
+
+                    b.Property<string>("NormalizedName")
+                        .HasMaxLength(256)
+                        .HasColumnType("nvarchar(256)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("NormalizedName")
+                        .IsUnique()
+                        .HasDatabaseName("RoleNameIndex")
+                        .HasFilter("[NormalizedName] IS NOT NULL");
+
+                    b.ToTable("AspNetRoles", (string)null);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"), 1L, 1);
+
+                    b.Property<string>("ClaimType")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("ClaimValue")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("RoleId")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(450)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("RoleId");
+
+                    b.ToTable("AspNetRoleClaims", (string)null);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<string>", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"), 1L, 1);
+
+                    b.Property<string>("ClaimType")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("ClaimValue")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("UserId")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(450)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("AspNetUserClaims", (string)null);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<string>", b =>
+                {
+                    b.Property<string>("LoginProvider")
+                        .HasMaxLength(128)
+                        .HasColumnType("nvarchar(128)");
+
+                    b.Property<string>("ProviderKey")
+                        .HasMaxLength(128)
+                        .HasColumnType("nvarchar(128)");
+
+                    b.Property<string>("ProviderDisplayName")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("UserId")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(450)");
+
+                    b.HasKey("LoginProvider", "ProviderKey");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("AspNetUserLogins", (string)null);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<string>", b =>
+                {
+                    b.Property<string>("UserId")
+                        .HasColumnType("nvarchar(450)");
+
+                    b.Property<string>("RoleId")
+                        .HasColumnType("nvarchar(450)");
+
+                    b.HasKey("UserId", "RoleId");
+
+                    b.HasIndex("RoleId");
+
+                    b.ToTable("AspNetUserRoles", (string)null);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<string>", b =>
+                {
+                    b.Property<string>("UserId")
+                        .HasColumnType("nvarchar(450)");
+
+                    b.Property<string>("LoginProvider")
+                        .HasMaxLength(128)
+                        .HasColumnType("nvarchar(128)");
+
+                    b.Property<string>("Name")
+                        .HasMaxLength(128)
+                        .HasColumnType("nvarchar(128)");
+
+                    b.Property<string>("Value")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.HasKey("UserId", "LoginProvider", "Name");
+
+                    b.ToTable("AspNetUserTokens", (string)null);
+                });
+
+            modelBuilder.Entity("DoctorSystem.Models.Comment", b =>
+                {
+                    b.HasOne("DoctorSystem.Models.DefaultUser", "Creator")
+                        .WithMany()
+                        .HasForeignKey("CreatorId");
+
+                    b.HasOne("DoctorSystem.Models.Post", "Post")
+                        .WithMany("Comments")
+                        .HasForeignKey("PostId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Creator");
+
+                    b.Navigation("Post");
+                });
+
+            modelBuilder.Entity("DoctorSystem.Models.Post", b =>
+                {
+                    b.HasOne("DoctorSystem.Models.Category", "Category")
+                        .WithMany()
+                        .HasForeignKey("CategoryId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("DoctorSystem.Models.DefaultUser", "Creator")
+                        .WithMany()
+                        .HasForeignKey("CreatorId");
+
+                    b.Navigation("Category");
+
+                    b.Navigation("Creator");
+                });
+
+            modelBuilder.Entity("DoctorSystem.Models.RoleRequest", b =>
+                {
+                    b.HasOne("DoctorSystem.Models.DefaultUser", "Requester")
+                        .WithMany()
+                        .HasForeignKey("RequesterId");
+
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", "Role")
+                        .WithMany()
+                        .HasForeignKey("RoleId");
+
+                    b.Navigation("Requester");
+
+                    b.Navigation("Role");
+                });
+
+            modelBuilder.Entity("DoctorSystem.Models.UserFriendship", b =>
+                {
+                    b.HasOne("DoctorSystem.Models.DefaultUser", "UserFriend")
+                        .WithMany("FriendsOf")
+                        .HasForeignKey("UserFriendId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.HasOne("DoctorSystem.Models.DefaultUser", "User")
+                        .WithMany("Friends")
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.Navigation("User");
+
+                    b.Navigation("UserFriend");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null)
+                        .WithMany()
+                        .HasForeignKey("RoleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<string>", b =>
+                {
+                    b.HasOne("DoctorSystem.Models.DefaultUser", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<string>", b =>
+                {
+                    b.HasOne("DoctorSystem.Models.DefaultUser", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<string>", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null)
+                        .WithMany()
+                        .HasForeignKey("RoleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("DoctorSystem.Models.DefaultUser", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<string>", b =>
+                {
+                    b.HasOne("DoctorSystem.Models.DefaultUser", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("DoctorSystem.Models.DefaultUser", b =>
+                {
+                    b.Navigation("Friends");
+
+                    b.Navigation("FriendsOf");
+                });
+
+            modelBuilder.Entity("DoctorSystem.Models.Post", b =>
+                {
+                    b.Navigation("Comments");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/Data/Migrations/20221213134819_Category.cs b/Data/Migrations/20221213134819_Category.cs
new file mode 100644
index 0000000..e69cc1a
--- /dev/null
+++ b/Data/Migrations/20221213134819_Category.cs
@@ -0,0 +1,63 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace DoctorSystem.Data.Migrations
+{
+    public partial class Category : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<int>(
+                name: "CategoryId",
+                table: "Post",
+                type: "int",
+                nullable: false,
+                defaultValue: 0);
+
+            migrationBuilder.CreateTable(
+                name: "Category",
+                columns: table => new
+                {
+                    Id = table.Column<int>(type: "int", nullable: false)
+                        .Annotation("SqlServer:Identity", "1, 1"),
+                    Name = table.Column<string>(type: "nvarchar(max)", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_Category", x => x.Id);
+                });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_Post_CategoryId",
+                table: "Post",
+                column: "CategoryId");
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_Post_Category_CategoryId",
+                table: "Post",
+                column: "CategoryId",
+                principalTable: "Category",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(
+                name: "FK_Post_Category_CategoryId",
+                table: "Post");
+
+            migrationBuilder.DropTable(
+                name: "Category");
+
+            migrationBuilder.DropIndex(
+                name: "IX_Post_CategoryId",
+                table: "Post");
+
+            migrationBuilder.DropColumn(
+                name: "CategoryId",
+                table: "Post");
+        }
+    }
+}
diff --git a/Data/Migrations/ApplicationDbContextModelSnapshot.cs b/Data/Migrations/ApplicationDbContextModelSnapshot.cs
index 22e82c6..9477ab6 100644
--- a/Data/Migrations/ApplicationDbContextModelSnapshot.cs
+++ b/Data/Migrations/ApplicationDbContextModelSnapshot.cs
@@ -22,6 +22,23 @@ protected override void BuildModel(ModelBuilder modelBuilder)
 
             SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder, 1L, 1);
 
+            modelBuilder.Entity("DoctorSystem.Models.Category", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"), 1L, 1);
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Category");
+                });
+
             modelBuilder.Entity("DoctorSystem.Models.Comment", b =>
                 {
                     b.Property<int>("Id")
@@ -143,6 +160,9 @@ protected override void BuildModel(ModelBuilder modelBuilder)
 
                     SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"), 1L, 1);
 
+                    b.Property<int>("CategoryId")
+                        .HasColumnType("int");
+
                     b.Property<string>("CreatorId")
                         .HasColumnType("nvarchar(450)");
 
@@ -159,6 +179,8 @@ protected override void BuildModel(ModelBuilder modelBuilder)
 
                     b.HasKey("Id");
 
+                    b.HasIndex("CategoryId");
+
                     b.HasIndex("CreatorId");
 
                     b.ToTable("Post");
@@ -364,10 +386,18 @@ protected override void BuildModel(ModelBuilder modelBuilder)
 
             modelBuilder.Entity("DoctorSystem.Models.Post", b =>
                 {
+                    b.HasOne("DoctorSystem.Models.Category", "Category")
+                        .WithMany()
+                        .HasForeignKey("CategoryId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
                     b.HasOne("DoctorSystem.Models.DefaultUser", "Creator")
                         .WithMany()
                         .HasForeignKey("CreatorId");
 
+                    b.Navigation("Category");
+
                     b.Navigation("Creator");
                 });
 
diff --git a/DoctorSystem.csproj b/DoctorSystem.csproj
index 70018ef..a4392dc 100644
--- a/DoctorSystem.csproj
+++ b/DoctorSystem.csproj
@@ -9,6 +9,7 @@
 
   <ItemGroup>
     <PackageReference Include="Azure.Communication.Email" Version="1.0.0-beta.1" />
+    <PackageReference Include="HtmlSanitizer" Version="8.0.601" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.Facebook" Version="6.0.11" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.Google" Version="6.0.11" />
     <PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="6.0.10" />
diff --git a/Misc/Role.cs b/Misc/Role.cs
new file mode 100644
index 0000000..4d247d2
--- /dev/null
+++ b/Misc/Role.cs
@@ -0,0 +1,10 @@
+namespace DoctorSystem.Misc
+{
+    public static class Role
+    {
+        public static string Guest = "Guest";
+        public static string Admin = "Admin";
+        public static string Doctor = "Doctor";
+        public static string Patient = "Patient";
+    }
+}
diff --git a/Models/Category.cs b/Models/Category.cs
new file mode 100644
index 0000000..8f58924
--- /dev/null
+++ b/Models/Category.cs
@@ -0,0 +1,17 @@
+using Microsoft.Build.Framework;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+
+namespace DoctorSystem.Models
+{
+    public class Category
+    {
+        public int Id { get; set; }
+        [Required]
+        public string Name { get; set; }
+
+        public override string ToString()
+        {
+            return Name;
+        }
+    }
+}
diff --git a/Models/DefaultUser.cs b/Models/DefaultUser.cs
index df501cc..ae57440 100644
--- a/Models/DefaultUser.cs
+++ b/Models/DefaultUser.cs
@@ -1,4 +1,5 @@
 using Humanizer;
+using MessagePack;
 using Microsoft.AspNetCore.Identity;
 using System.ComponentModel.DataAnnotations;
 
@@ -11,6 +12,14 @@ public class DefaultUser : IdentityUser
         public string? LastName { get; set; }
 
         public string? Gender { get; set; }
+        
+        public string FullName
+        {
+            get {
+                if (DoctorUID != null) { return "Dr." + FirstName + " " + LastName; }
+                return FirstName + " " + LastName; 
+            }
+        }
 
         [DataType(DataType.Date)]
         public DateTime? DateOfBirth { get; set; }
@@ -18,6 +27,8 @@ public class DefaultUser : IdentityUser
         public string? DoctorUID { get; set; }
         public ICollection<UserFriendship> FriendsOf { get; set; }
         public ICollection<UserFriendship> Friends { get; set; }
+       
+        
     }
 
     public class UserFriendship
diff --git a/Models/Post.cs b/Models/Post.cs
index c054779..762a275 100644
--- a/Models/Post.cs
+++ b/Models/Post.cs
@@ -18,7 +18,10 @@ public class Post
 
         public ICollection<Comment> Comments { get; set; } = new List<Comment>();
 
+        //!!
+        public int CategoryId { get; set; }
 
+        public Category Category { get; set; }
 
     }
 }
diff --git a/Models/PostCategoryViewModel.cs b/Models/PostCategoryViewModel.cs
new file mode 100644
index 0000000..e7e44e7
--- /dev/null
+++ b/Models/PostCategoryViewModel.cs
@@ -0,0 +1,9 @@
+namespace DoctorSystem.Models
+{
+    public class PostCategoryViewModel
+    {
+        public Post Post { get; set; }
+        public Category Category { get; set; }
+
+    }
+}
diff --git a/Models/PostDetailViewModel.cs b/Models/PostDetailViewModel.cs
new file mode 100644
index 0000000..e6d89ea
--- /dev/null
+++ b/Models/PostDetailViewModel.cs
@@ -0,0 +1,10 @@
+namespace DoctorSystem.Models
+{
+    public class PostDetailViewModel
+    {
+        public Post Post { get; set; }
+        public string Text { get; set; }
+        public int PostId { get; set; }
+
+    }
+}
diff --git a/Models/Posts.cs b/Models/Posts.cs
deleted file mode 100644
index f464a78..0000000
--- a/Models/Posts.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using System.ComponentModel.DataAnnotations;
-
-namespace DoctorSystem.Models
-{
-    public class Posts
-    {
-        public int Id { get; set; }
-
-        public string Title { get; set; }
-
-        public string Description { get; set; }
-
-        public DateOnly DateCreated { get; set; }
-
-        //така или свързочна таблица(OneToMany)
-        public IEnumerable<string> Comments { get; set; }
-
-
-
-    }
-}
diff --git a/Program.cs b/Program.cs
index a9da318..3f308ef 100644
--- a/Program.cs
+++ b/Program.cs
@@ -8,6 +8,7 @@
 using System.Configuration;
 using Microsoft.AspNetCore.Authentication.Google;
 using Microsoft.Extensions.Options;
+using DoctorSystem.Singleton;
 
 var builder = WebApplication.CreateBuilder(args);
 
@@ -20,8 +21,22 @@
 builder.Services.AddDefaultIdentity<DefaultUser>(options => options.SignIn.RequireConfirmedAccount = true)
     .AddRoles<IdentityRole>()
     .AddEntityFrameworkStores<ApplicationDbContext>();
-    
-builder.Services.AddControllersWithViews();
+
+builder.Services.Configure<IdentityOptions>(options =>
+{
+    options.Lockout.MaxFailedAccessAttempts = 10;
+    options.Lockout.DefaultLockoutTimeSpan = TimeSpan.FromMinutes(10);
+});
+
+
+builder.Services.Configure<Config>(builder.Configuration.GetSection("Config"));
+builder.Services.AddControllersWithViews()
+    .AddJsonOptions(options =>
+    {
+        options.JsonSerializerOptions.Converters.Add(new AntiXssConverter());
+    });
+
+
 builder.Services.AddTransient<IEmailSender, EmailService>();
 
 var configuration = builder.Configuration;
@@ -75,6 +90,7 @@
 
 app.UseAuthentication();
 app.UseAuthorization();
+app.UseMiddleware<AntiXssMiddleware>();
 
 app.MapControllerRoute(
     name: "default",
diff --git a/Singleton/AntiXssConverter.cs b/Singleton/AntiXssConverter.cs
new file mode 100644
index 0000000..8d3ea55
--- /dev/null
+++ b/Singleton/AntiXssConverter.cs
@@ -0,0 +1,28 @@
+using Ganss.Xss;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace DoctorSystem.Singleton
+{
+    public class AntiXssConverter : JsonConverter<string>
+    {
+        public override string? Read(ref Utf8JsonReader reader,
+                                Type typeToConvert, JsonSerializerOptions options)
+        {
+            var sanitiser = new HtmlSanitizer();
+            var raw = reader.GetString();
+            var sanitised = sanitiser.Sanitize(raw);
+
+            if (raw == sanitised)
+                return sanitised;
+
+            throw new Exception("XSS injection detected.");
+        }
+
+        public override void Write(Utf8JsonWriter writer, string value,
+                                   JsonSerializerOptions options)
+        {
+            writer.WriteStringValue(value);
+        }
+    }
+}
diff --git a/Singleton/AntiXssMiddleware.cs b/Singleton/AntiXssMiddleware.cs
new file mode 100644
index 0000000..df962cb
--- /dev/null
+++ b/Singleton/AntiXssMiddleware.cs
@@ -0,0 +1,40 @@
+using Ganss.Xss;
+using System.Text;
+
+namespace DoctorSystem.Singleton
+{
+    public class AntiXssMiddleware
+    {
+        private readonly RequestDelegate _next;
+
+        public AntiXssMiddleware(RequestDelegate next)
+        {
+            _next = next;
+        }
+
+        public async Task Invoke(HttpContext httpContext)
+        {
+            // enable buffering so that the request can be read by the model binders next
+            httpContext.Request.EnableBuffering();
+
+            // leaveOpen: true to leave the stream open after disposing,
+            // so it can be read by the model binders
+            using (var streamReader = new StreamReader
+                  (httpContext.Request.Body, Encoding.UTF8, leaveOpen: true))
+            {
+                var raw = await streamReader.ReadToEndAsync();
+                var sanitiser = new HtmlSanitizer();
+                var sanitised = sanitiser.Sanitize(raw);
+
+                if (raw != sanitised)
+                {
+                    Console.WriteLine("XSS injection detected from middleware.");
+                }
+            }
+
+            // rewind the stream for the next middleware
+            httpContext.Request.Body.Seek(0, SeekOrigin.Begin);
+            await _next.Invoke(httpContext);
+        }
+    }
+}
diff --git a/Singleton/Config.cs b/Singleton/Config.cs
new file mode 100644
index 0000000..534aa92
--- /dev/null
+++ b/Singleton/Config.cs
@@ -0,0 +1,7 @@
+namespace DoctorSystem.Singleton;
+
+public class Config
+{
+    public string CaptchaKey { get; set; }
+    public string CaptchaSecret { get; set; }
+}
diff --git a/Views/Home/Index.cshtml b/Views/Home/Index.cshtml
index c62e281..28083ae 100644
--- a/Views/Home/Index.cshtml
+++ b/Views/Home/Index.cshtml
@@ -35,18 +35,18 @@
 		<div class="container">
 			<div class="row">
 				<div class="col-md-6 col-sm-6">
-					<div class="about-text" id="AboutUs">
-						<ul>
+					<div class="about-text">
+						<ul id="AboutUs">
 							<li>Повече опит</li>
 							<li>Точна диагноза</li>
 							<li>Вие сте на първо място</li>
 							<li>Иновация с въздействие</li>
 						</ul>
 						
-					<div class="about-image">
+						<div class="about-image" id="AboutImg">
 						<img src="~/img/aboutUs.jpg" alt="About Images">
 					
-					</div>
+						</div>
 					</div>
 				</div>
 			</div>
diff --git a/Views/Posting/CreatePost.cshtml b/Views/Posting/CreatePost.cshtml
deleted file mode 100644
index d67b00c..0000000
--- a/Views/Posting/CreatePost.cshtml
+++ /dev/null
@@ -1,23 +0,0 @@
-@model Posts
-
-@{
-    ViewData["Title"] = "Posting Page";
-}
-@*
-    For more information on enabling MVC for empty projects, visit https://go.microsoft.com/fwlink/?LinkID=397860
-*@
-@{
-}
-<h2>@ViewData["Title"]</h2>
-<h2>Create</h2>
-<form method="post">
-    <p>
-        <label asp-for="Title">Title:</label>
-        <input asp-for="Title" />
-    </p>
-    <p>
-        <label asp-for="Description">Describe your problem:</label>
-        <input asp-for="Description" />
-    </p>
-    <p><button type="submit">Submit</button></p>
-</form>
diff --git a/Views/Posting/Created.cshtml b/Views/Posting/Created.cshtml
deleted file mode 100644
index 6a20f2d..0000000
--- a/Views/Posting/Created.cshtml
+++ /dev/null
@@ -1,7 +0,0 @@
-@model Posts
-@*
-    For more information on enabling MVC for empty projects, visit https://go.microsoft.com/fwlink/?LinkID=397860
-*@
-@{
-}
-<h2>Post @Model.Title Created</h2>
diff --git a/Views/Posting/Index.cshtml b/Views/Posting/Index.cshtml
deleted file mode 100644
index 50ae8df..0000000
--- a/Views/Posting/Index.cshtml
+++ /dev/null
@@ -1,18 +0,0 @@
-@*
-    For more information on enabling MVC for empty projects, visit https://go.microsoft.com/fwlink/?LinkID=397860
-*@
-@{
-    ViewData["Title"] = "All posts";
-}
-<h2>@ViewData["Title"]</h2>
-
-
-
-
-
-
-
-
-
-
-    
diff --git a/Views/Posts/Create.cshtml b/Views/Posts/Create.cshtml
index 1b16c38..cf72ac5 100644
--- a/Views/Posts/Create.cshtml
+++ b/Views/Posts/Create.cshtml
@@ -5,13 +5,15 @@
     Layout = "~/Views/Shared/_Layout.cshtml";
 }
 
+<div class="title">
 <h1>Create</h1>
 
-<h4>Post</h4>
+<h3>Post</h3>
 <hr />
+</div>
 <div class="row">
     <div class="col-md-4">
-        <form asp-action="Create">
+        <form id="createPost" asp-action="Create">
             <div asp-validation-summary="ModelOnly" class="text-danger"></div>
             <div class="form-group">
                 <label asp-for="Title" class="control-label"></label>
@@ -23,6 +25,13 @@
                 <input asp-for="Description" class="form-control" />
                 <span asp-validation-for="Description" class="text-danger"></span>
             </div>
+            <div class="form-group">
+                <label asp-for="CategoryId" class="control-label"></label>
+                <select asp-for="CategoryId" asp-items="ViewBag.CategoryList" class="form-select">
+                    <option disabled selected>Select Category</option>
+                </select>
+                <span asp-validation-for="CategoryId" class="text-danger"></span>
+            </div>
             <div class="form-group">
                 <input type="submit" value="Create" class="btn btn-primary" />
             </div>
diff --git a/Views/Posts/Delete.cshtml b/Views/Posts/Delete.cshtml
index 3659880..fc289ef 100644
--- a/Views/Posts/Delete.cshtml
+++ b/Views/Posts/Delete.cshtml
@@ -4,14 +4,15 @@
     ViewData["Title"] = "Delete";
     Layout = "~/Views/Shared/_Layout.cshtml";
 }
-
+<div class="title">
 <h1>Delete</h1>
 
 <h3>Are you sure you want to delete this?</h3>
-<div>
+</div>
+<div id="createPost">
     <h4>Post</h4>
     <hr />
-    <dl class="row">
+    <dl class="row" id="createPost">
         <dt class = "col-sm-2">
             @Html.DisplayNameFor(model => model.Title)
         </dt>
@@ -35,6 +36,6 @@
     <form asp-action="Delete">
         <input type="hidden" asp-for="Id" />
         <input type="submit" value="Delete" class="btn btn-danger" /> |
-        <a asp-action="Index">Back to List</a>
+        <a asp-action="Index">Back to List</a>  
     </form>
 </div>
diff --git a/Views/Posts/DeleteComment.cshtml b/Views/Posts/DeleteComment.cshtml
new file mode 100644
index 0000000..d933c66
--- /dev/null
+++ b/Views/Posts/DeleteComment.cshtml
@@ -0,0 +1,40 @@
+@model DoctorSystem.Models.Comment
+
+@{
+    ViewData["Title"] = "Delete";
+    Layout = "~/Views/Shared/_Layout.cshtml";
+}
+<div class="title">
+<h1>Delete</h1>
+
+<h3>Are you sure you want to delete this comment?</h3>
+</div>
+<div id="createPost">
+    <h4>Comment</h4>
+    <hr />
+    <dl class="row">
+        <dt class="col-sm-2">
+            @Html.DisplayNameFor(model => model.CreatedAt)
+        </dt>
+        <dd class="col-sm-10">
+            @Html.DisplayFor(model => model.CreatedAt)
+        </dd>
+        <dt class="col-sm-2">
+            @Html.DisplayNameFor(model => model.Text)
+        </dt>
+        <dd class="col-sm-10">
+            @Html.DisplayFor(model => model.Text)
+        </dd>
+        <dt class="col-sm-2">
+            @Html.DisplayNameFor(model => model.Post)
+        </dt>
+        <dd class="col-sm-10">
+            @Html.DisplayFor(model => model.Post.Description)
+        </dd>
+    </dl>
+    
+    <form asp-action="DeleteCommentConfirmed">
+        <input type="hidden" asp-for="Id" />
+        <input type="submit" value="Delete" class="btn btn-danger" /> |
+    </form>
+</div>
diff --git a/Views/Posts/Details.cshtml b/Views/Posts/Details.cshtml
index 40e3db9..bebab8d 100644
--- a/Views/Posts/Details.cshtml
+++ b/Views/Posts/Details.cshtml
@@ -1,34 +1,93 @@
-@model DoctorSystem.Models.Post
+@model DoctorSystem.Models.PostDetailViewModel
 
 @{
     ViewData["Title"] = "Details";
     Layout = "~/Views/Shared/_Layout.cshtml";
 }
-
+<div class="title">
 <h1>Details</h1>
-
+</div>
 <div>
-    <h4>Post</h4>
+    <h4 id="createPost">Post</h4>
     <hr />
     <dl class="row">
+        <dt class="col-sm-2">
+            @Html.DisplayNameFor(model => model.Post.Creator)
+        </dt>
+        <dd class="col-sm-10">
+            @Html.DisplayFor(model => model.Post.Creator.FullName)
+        </dd>
         <dt class = "col-sm-2">
-            @Html.DisplayNameFor(model => model.Title)
+            @Html.DisplayNameFor(model => model.Post.Title)
         </dt>
         <dd class = "col-sm-10">
-            @Html.DisplayFor(model => model.Title)
+            @Html.DisplayFor(model => model.Post.Title)
         </dd>
         <dt class = "col-sm-2">
-            @Html.DisplayNameFor(model => model.Description)
+            @Html.DisplayNameFor(model => model.Post.Description)
         </dt>
         <dd class = "col-sm-10">
-            @Html.DisplayFor(model => model.Description)
+            @Html.DisplayFor(model => model.Post.Description)
         </dd>
         <dt class = "col-sm-2">
-            @Html.DisplayNameFor(model => model.DateCreated)
+            @Html.DisplayNameFor(model => model.Post.DateCreated)
         </dt>
         <dd class = "col-sm-10">
-            @Html.DisplayFor(model => model.DateCreated)
+            @Html.DisplayFor(model => model.Post.DateCreated)
         </dd>
     </dl>
+    <table class="table">
+        <thead>
+            <tr>
+                <th>
+                    @Html.DisplayNameFor(model => model.Post.Creator)
+                </th>
+                <th>
+                    @Html.DisplayNameFor(model => model.Text)
+                </th>
+                <th>
+                    Date Created
+                </th>
+                <th></th>
+            </tr>
+        </thead>
+        <tbody>
+            @foreach (var item in Model.Post.Comments)
+            {
+                <tr>
+                    <td>
+                        @Html.DisplayFor(modelItem => item.Creator.FullName)
+                    </td>
+                    <td>
+                        @Html.DisplayFor(modelItem => item.Text)
+                    </td>
+                    <td>
+                        @Html.DisplayFor(modelItem => item.CreatedAt)
+                    </td>
+                    <td>
+                        @if (item.Creator.Email == User.Identity.Name)
+                        {
+                           <a asp-action="EditComment" asp-route-id="@item.Id">EditComment|</a>
+                           <a asp-action="DeleteComment" asp-route-id="@item.Id">DeleteComment</a>
+                        }
+                    </td>
+                </tr>
+            }
+        </tbody>
+    </table>
+    <div>
+        <form asp-action="CreateComment">
+            <div asp-validation-summary="ModelOnly" class="text-danger"></div>
+            <input type="hidden" asp-for="PostId" />
+            <div class="form-group">
+                <label as asp-for="@Model.Text" class="control-label"></label>
+                <input asp-for="@Model.Text" class="form-control" />
+                <span asp-validation-for="@Model.Text" class="text-danger"></span>
+            </div>
+            <div class="form-group">
+                <input type="submit" value="CreateComment" class="btn btn-primary" />
+            </div>
+        </form>
+    </div>
 </div>
 
diff --git a/Views/Posts/Edit.cshtml b/Views/Posts/Edit.cshtml
index af049f1..479c188 100644
--- a/Views/Posts/Edit.cshtml
+++ b/Views/Posts/Edit.cshtml
@@ -4,14 +4,15 @@
     ViewData["Title"] = "Edit";
     Layout = "~/Views/Shared/_Layout.cshtml";
 }
-
+<div class="title">
 <h1>Edit</h1>
 
-<h4>Post</h4>
+<h3>Post</h3>
 <hr />
+</div>
 <div class="row">
     <div class="col-md-4">
-        <form asp-action="Edit">
+        <form id="createPost" asp-action="Edit">
             <div asp-validation-summary="ModelOnly" class="text-danger"></div>
             <input type="hidden" asp-for="Id" />
             <div class="form-group">
@@ -24,12 +25,6 @@
                 <input asp-for="Description" class="form-control" />
                 <span asp-validation-for="Description" class="text-danger"></span>
             </div>
-            @*ToDo-да махна възможността за редактиране на дата*@
-            <div class="form-group">
-                <label asp-for="DateCreated" class="control-label"></label>
-                <input asp-for="DateCreated" class="form-control" />
-                <span asp-validation-for="DateCreated" class="text-danger"></span>
-            </div>
             <div class="form-group">
                 <input type="submit" value="Save" class="btn btn-primary" />
             </div>
diff --git a/Views/Posts/EditComment.cshtml b/Views/Posts/EditComment.cshtml
new file mode 100644
index 0000000..25902d9
--- /dev/null
+++ b/Views/Posts/EditComment.cshtml
@@ -0,0 +1,41 @@
+@model DoctorSystem.Models.Comment
+
+@{
+    ViewData["Title"] = "Edit";
+    Layout = "~/Views/Shared/_Layout.cshtml";
+}
+<div class="title">
+<h1>Edit</h1>
+
+<h4>Comment</h4>
+<hr />
+</div>
+<div class="row">
+    <div class="col-md-4">
+        <form id="createPost" asp-action="EditComment">
+            <div asp-validation-summary="ModelOnly" class="text-danger"></div>
+            <input type="hidden" asp-for="Id" />
+            @*<input type="hidden" asp-for="PostId">*@
+            @*<div class="form-group">
+                <label asp-for="PostId" class="control-label"></label>
+                <select asp-for="PostId" class="form-control" asp-items="ViewBag.PostId"></select>
+                <span asp-validation-for="PostId" class="text-danger"></span>
+            </div>*@
+            <div class="form-group">
+                <label asp-for="Text" class="control-label"></label>
+                <input asp-for="Text" class="form-control" />
+                <span asp-validation-for="Text" class="text-danger"></span>
+            </div>
+            <div class="form-group">
+                <input type="submit" value="Save" class="btn btn-primary" />
+            </div>
+        </form>
+    </div>
+</div>
+
+
+@section Scripts {
+    @{
+        await Html.RenderPartialAsync("_ValidationScriptsPartial");
+    }
+    }
diff --git a/Views/Posts/Index.cshtml b/Views/Posts/Index.cshtml
index 723089b..0fedd5b 100644
--- a/Views/Posts/Index.cshtml
+++ b/Views/Posts/Index.cshtml
@@ -4,12 +4,19 @@
     ViewData["Title"] = "Index";
     Layout = "~/Views/Shared/_Layout.cshtml";
 }
-
+<div class="title">
 <h1>Posts</h1>
-
 <p>
     <a asp-action="Create">Create New</a>
 </p>
+</div>
+@using (Html.BeginForm())
+{
+    <p>
+        Find by Category: @Html.TextBox("SearchString")
+        <input type="submit" value="Search" />
+    </p>
+}
 <table class="table">
     <thead>
         <tr>
@@ -19,9 +26,15 @@
             <th>
                 @Html.DisplayNameFor(model => model.Description)
             </th>
+            <th>
+                @Html.DisplayNameFor(model => model.Creator)
+            </th>
             <th>
                 @Html.DisplayNameFor(model => model.DateCreated)
             </th>
+            <th>
+                @Html.DisplayNameFor(model => model.Category)
+            </th>
             <th></th>
         </tr>
     </thead>
@@ -34,13 +47,22 @@
             <td>
                 @Html.DisplayFor(modelItem => item.Description)
             </td>
+            <td>
+                @Html.DisplayFor(model => item.Creator.FullName)
+            </td>
             <td>
                 @Html.DisplayFor(modelItem => item.DateCreated)
             </td>
             <td>
-                <a asp-action="Edit" asp-route-id="@item.Id">Edit</a> |
-                <a asp-action="Details" asp-route-id="@item.Id">Details</a> |
-                <a asp-action="Delete" asp-route-id="@item.Id">Delete</a>
+                @Html.DisplayFor(modelItem => item.Category.Name)
+            </td>
+            <td>
+                    @if (item.Creator.Email == User.Identity.Name)
+                    {
+                        <a asp-action="Delete" asp-route-id="@item.Id">Delete|</a>
+                        <a asp-action="Edit" asp-route-id="@item.Id">Edit|</a>
+                    }
+                    <a asp-action="Details" asp-route-id="@item.Id">Details</a>
             </td>
         </tr>
 }
diff --git a/Views/Shared/_Layout.cshtml b/Views/Shared/_Layout.cshtml
index 5824bf7..1eea4eb 100644
--- a/Views/Shared/_Layout.cshtml
+++ b/Views/Shared/_Layout.cshtml
@@ -23,7 +23,6 @@
     <div class="row">
       <div class="col-md-12">
         <p class="pull-left hidden-xs">Ask A Doc</p>
-        <!--<p class="pull-right"><i class="fa fa-ambulance"></i>Emergency No. (+001) 123-456-789</p> -->
       </div>
     </div>
   </div>
@@ -38,7 +37,9 @@
                         <span class="icon-bar"></span>
                         <span class="icon-bar"></span>
                     </button>
-                    <a class="navbar-brand" asp-controller="RoleRequests" asp-action="Index" ><img id="logo" src="~/img/logo.png" alt="logo"/></a>
+										
+					
+                    <a class="navbar-brand" asp-controller="Home" asp-action="Index" ><img id="logo" src="~/img/logo.png" alt="logo"/></a>
                 </div>
                 <div class="navbar-collapse collapse ">
                     <ul class="nav navbar-nav">
@@ -52,9 +53,18 @@
                             <li><a href="#">Investors</a></li>
                         </ul>
 						</li>
-            <li><a asp-controller="RoleRequests" asp-action="Index">Requests</a></li>
-						<li><a asp-controller="Home" asp-action="Posting">Досие</a></li>
-						<li><a asp-controller="Home" asp-action="Posting">Случаи</a></li>
+						@if (User.IsInRole("Admin"))
+						{
+							<li><a asp-controller="RoleRequests" asp-action="Index">Requests</a></li>
+						}
+						@if (User.IsInRole("Patient"))
+						{
+							<li><a asp-controller="Posts" asp-action="Index">Досие</a></li>
+						}
+						@if(User.IsInRole("Doctor")||User.IsInRole("Admin"))
+						{
+							<li><a asp-controller="Posts" asp-action="Index">Случаи</a></li>
+						}
 						<li><a asp-controller="Home" asp-action="Privacy">Контакти</a></li>
             
 						<partial name="_LoginPartial" />
@@ -75,19 +85,6 @@
     <footer>
 	<div class="container">
 		<div class="row">
-			<div class="col-lg-3">
-				<div class="widget">
-					<h5 class="widgetheading">Our Contact</h5>
-					<address>
-					<strong>Medico company Inc</strong><br>
-					JC Main Road, Near Silnile tower<br>
-					 Pin-21542 NewYork US.</address>
-					<p>
-						<i class="icon-phone"></i> (123) 456-789 - 1255-12584 <br>
-						<i class="icon-envelope-alt"></i> email@domainname.com
-					</p>
-				</div>
-			</div>
 			<div class="col-lg-3">
 				<div class="widget">
 					<h5 class="widgetheading">Quick Links</h5>
@@ -100,52 +97,18 @@
 					</ul>
 				</div>
 			</div>
-				<!-- <div class="col-lg-3">
-					<div class="widget">
-						<h5 class="widgetheading">Latest posts</h5>
-						<ul class="link-list">
-							<li><a href="#">Lorem ipsum dolor sit amet, consectetur adipiscing elit.</a></li>
-							<li><a href="#">Pellentesque et pulvinar enim. Quisque at tempor ligula</a></li>
-							<li><a href="#">Natus error sit voluptatem accusantium doloremque</a></li>
-						</ul>
-					</div>
-				</div>
-			
-			<div class="col-lg-3">
-				<div class="widget">
-					<h5 class="widgetheading">Recent News</h5>
-					<ul class="link-list">
-						<li><a href="#">Lorem ipsum dolor sit amet, consectetur adipiscing elit.</a></li>
-						<li><a href="#">Pellentesque et pulvinar enim. Quisque at tempor ligula</a></li>
-						<li><a href="#">Natus error sit voluptatem accusantium doloremque</a></li>
-					</ul>
-				</div>
-			</div>-->
+				
+		</div>
 		</div>
-		</div
+        <!--
 	<div id="sub-footer">
-		<div class="container">
-			<div class="row">
-				<div class="col-lg-6">
-					<div class="copyright">
+		
 						<p>
 							<span>&copy; Medico 2022 All right reserved. </span> <a href="https://webthemez.com/free-bootstrap-templates/" target="_blank">Free Bootstrap Template</a> by WebThemez.com
 						</p>
-					</div>
-				</div>
-				<div class="col-lg-6">
-					<ul class="social-network">
-						<li><a href="#" data-placement="top" title="Facebook"><i class="fa fa-facebook"></i></a></li>
-						<li><a href="#" data-placement="top" title="Twitter"><i class="fa fa-twitter"></i></a></li>
-						<li><a href="#" data-placement="top" title="Linkedin"><i class="fa fa-linkedin"></i></a></li>
-						<li><a href="#" data-placement="top" title="Pinterest"><i class="fa fa-pinterest"></i></a></li>
-						<li><a href="#" data-placement="top" title="Google plus"><i class="fa fa-google-plus"></i></a></li>
-					</ul>
-				</div>
-			</div>
-		</div>
-	</div>
-	</footer>
+			
+        </div> -->
+    </footer>
     <script src="~/lib/jquery/dist/jquery.min.js"></script>
     <script src="~/lib/bootstrap/dist/js/bootstrap.bundle.min.js"></script>
     <script src="~/js/site.js" asp-append-version="true"></script>
diff --git a/wwwroot/css/style.css b/wwwroot/css/style.css
index 1d0b13a..7456388 100644
--- a/wwwroot/css/style.css
+++ b/wwwroot/css/style.css
@@ -13,8 +13,25 @@ Note: Licence under Creative Commons Attribution 3.0
 
 #AboutUs {
 	margin-top: -150px;
+	font-size: 20px;
 }
 
+#AboutImg {
+	position: relative;
+	left: 470px;
+	top: -125px;
+}
+#createPost {
+	width: 100%;
+	border: 1px solid #f5f5f5;
+	min-height: 40px;
+	padding-left: 20px;
+	font-size: 13px;
+	padding-right: 80px;
+	-webkit-box-sizing: border-box;
+	-moz-box-sizing: border-box;
+	box-sizing: border-box;
+}
 #registerForm {
 	width: 100%;
 	border: 1px solid #f5f5f5;
@@ -31,7 +48,7 @@ Note: Licence under Creative Commons Attribution 3.0
 	width: 100%;
 	border: 1px solid #f5f5f5;
 	min-height: 40px;
-	padding-left: 20px;
+	padding-left: 14px;
 	font-size: 13px;
 	padding-right: 20px;
 	-webkit-box-sizing: border-box;
diff --git a/wwwroot/img/about.jpg b/wwwroot/img/about.jpg
deleted file mode 100644
index 3069746..0000000
Binary files a/wwwroot/img/about.jpg and /dev/null differ