diff --git a/StudentHouseDashboard/Models/Announcement.cs b/StudentHouseDashboard/Models/Announcement.cs
index 05ef4ed..cff3052 100644
--- a/StudentHouseDashboard/Models/Announcement.cs
+++ b/StudentHouseDashboard/Models/Announcement.cs
@@ -13,6 +13,10 @@ namespace Models
             IsSticky = isSticky;
         }
 
+        public Announcement()
+        {
+            
+        }
         public List<Comment> Comments
         {
             get;set;
diff --git a/StudentHouseDashboard/Models/GenericMessage.cs b/StudentHouseDashboard/Models/GenericMessage.cs
index 82305e9..c6ce2b8 100644
--- a/StudentHouseDashboard/Models/GenericMessage.cs
+++ b/StudentHouseDashboard/Models/GenericMessage.cs
@@ -20,7 +20,10 @@ namespace Models
             Title = title;
             PublishDate = publishDate;
         }
-
+        protected GenericMessage()
+        {
+            
+        }
         public int ID
         {
             get; private set;
diff --git a/StudentHouseDashboard/WebApp/Pages/Announcement.cshtml b/StudentHouseDashboard/WebApp/Pages/Announcement.cshtml
index 368957b..037692a 100644
--- a/StudentHouseDashboard/WebApp/Pages/Announcement.cshtml
+++ b/StudentHouseDashboard/WebApp/Pages/Announcement.cshtml
@@ -1,6 +1,7 @@
 @page
 @using Models;
 @using System.Globalization
+@using System.Security.Claims;
 @model WebApp.Pages.AnnouncementModel
 @{
     Announcement announcement = (Announcement)ViewData["announcement"];
@@ -14,6 +15,13 @@
         : "")
     @(announcement.IsImportant ? "Important" : "") @(announcement.IsSticky ? "Sticky" : "")
 </p>
+<p>
+    @if (User.FindFirst(ClaimTypes.Role).Value == "ADMIN" || User.Identity.Name == announcement.Author.Name)
+    {
+        <a href="./EditAnnouncement?id=@announcement.ID" class="btn btn-outline-warning">Edit</a>
+        <a href="./DeleteAnnouncement?id=@announcement.ID" class="btn btn-outline-danger">Delete</a>
+    }
+</p>
 <hr/>
 <p>@Html.Raw(announcement.Description.Replace(Environment.NewLine, "<br />"))</p>
 <br/>
diff --git a/StudentHouseDashboard/WebApp/Pages/Announcements.cshtml b/StudentHouseDashboard/WebApp/Pages/Announcements.cshtml
index 16546c1..8ecf464 100644
--- a/StudentHouseDashboard/WebApp/Pages/Announcements.cshtml
+++ b/StudentHouseDashboard/WebApp/Pages/Announcements.cshtml
@@ -4,29 +4,25 @@
 @model WebApp.Pages.AnnouncementsModel
 @{
     ViewData["Title"] = "Announcements";
-    List<Announcement> announcements = (List<Announcement>)ViewData["announcements"];
+    List<Announcement> announcements = ((List<Announcement>)ViewData["announcements"]).OrderByDescending(x => x.PublishDate).OrderByDescending(x => x.IsSticky).ToList();
     int currentPage = @Convert.ToInt32(ViewData["page"]);
 }
 
+<a href="./CreateAnnouncement" class="btn btn-primary">Create new announcement</a>
 
-
-@foreach (Announcement announcement in announcements)
-{
-    <div class="card" style="display:inline-block; width: 18rem;">
-        <div class="card-body">
-            <h5 class="card-title">@announcement.Title</h5>
-            <h6 class="card-subtitle mb-2 text-muted">@announcement.Author.Name</h6>
-            <p class="card-text">@announcement.Description.PadRight(100).Trim()</p>
-            <a href="./Announcement?id=@announcement.ID" class="btn btn-primary">More details</a>
-            @if (User.FindFirst(ClaimTypes.Role).Value == "ADMIN")
-            {
-                @: <a href="./Announcement?id=@announcement.ID" class="btn btn-outline-danger btn-sm">Delete</a>
-            }
+<div class="mb-3 mt-3">
+    @foreach (Announcement announcement in announcements)
+    {
+        <div class="card" style="display:inline-flex; width: 18rem;">
+            <div class="card-body">
+                <h5 class="card-title">@announcement.Title</h5>
+                <h6 class="card-subtitle mb-2 text-muted">@announcement.Author.Name</h6>
+                <p class="card-text">@announcement.Description.PadRight(100).Trim()</p>
+                <a href="./Announcement?id=@announcement.ID" class="btn btn-primary">More details</a>
+            </div>
         </div>
-    </div>
-}
-
-<br />
+    }
+</div>
 
 <nav aria-label="Page navigation">
     <ul class="pagination justify-content-center">
diff --git a/StudentHouseDashboard/WebApp/Pages/CreateAnnouncement.cshtml b/StudentHouseDashboard/WebApp/Pages/CreateAnnouncement.cshtml
new file mode 100644
index 0000000..7e473c4
--- /dev/null
+++ b/StudentHouseDashboard/WebApp/Pages/CreateAnnouncement.cshtml
@@ -0,0 +1,30 @@
+@page
+@model WebApp.Pages.CreateAnnouncementModel
+@{
+    ViewData["Title"] = "Create announcement";
+}
+
+<h1>@ViewData["Title"]</h1>
+
+<form method="post">
+    <div class="mb-3">
+    <label asp-for="Announcement.Title" class="form-label">Title: </label>
+    <input asp-for="Announcement.Title" class="form-control" />
+    </div>
+    @if (HttpContext.User.IsInRole("ADMIN") || HttpContext.User.IsInRole("MANAGER"))
+    {
+        <div class="mb-3">
+            <label asp-for="Announcement.IsImportant" class="form-label">Important: </label>
+            @Html.CheckBoxFor(model => model.Announcement.IsImportant)
+        </div>
+        <div class="mb-3">
+            <label asp-for="Announcement.IsSticky" class="form-label">Pinned: </label>
+            @Html.CheckBoxFor(model => model.Announcement.IsSticky)
+        </div>
+    }
+    <div class="mb-3">
+        <label asp-for="Announcement.Description" class="form-label">Description: </label>
+        <textarea asp-for="Announcement.Description" class="form-control" rows="5"></textarea>
+    </div>
+    <input type="submit" value="Create" class="btn btn-primary" />
+</form>
\ No newline at end of file
diff --git a/StudentHouseDashboard/WebApp/Pages/CreateAnnouncement.cshtml.cs b/StudentHouseDashboard/WebApp/Pages/CreateAnnouncement.cshtml.cs
new file mode 100644
index 0000000..1b41106
--- /dev/null
+++ b/StudentHouseDashboard/WebApp/Pages/CreateAnnouncement.cshtml.cs
@@ -0,0 +1,25 @@
+using Logic;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.RazorPages;
+using Models;
+using System.Security.Claims;
+
+namespace WebApp.Pages
+{
+    public class CreateAnnouncementModel : PageModel
+    {
+        [BindProperty]
+        public Announcement Announcement { get; set; }
+        public void OnGet()
+        {
+        }
+        public void OnPost()
+        {
+            AnnouncementManager announcementManager = new AnnouncementManager();
+            UserManager userManager = new UserManager();
+            User user = userManager.GetUserById(int.Parse(User.FindFirstValue("id")));
+            announcementManager.CreateAnnouncement(Announcement.Title, Announcement.Description, user, DateTime.Now, Announcement.IsImportant, Announcement.IsSticky);
+            RedirectToPage("Announcements");
+        }
+    }
+}
diff --git a/StudentHouseDashboard/WebApp/Pages/Shared/_Layout.cshtml b/StudentHouseDashboard/WebApp/Pages/Shared/_Layout.cshtml
index b268338..e05c50b 100644
--- a/StudentHouseDashboard/WebApp/Pages/Shared/_Layout.cshtml
+++ b/StudentHouseDashboard/WebApp/Pages/Shared/_Layout.cshtml
@@ -36,7 +36,15 @@
                             <li class="nav-item">
                                 <a class="nav-link text-dark" asp-area="" asp-page="/Announcements">Announcements</a>
                             </li>
-                            if (User.IsInRole("ADMIN") || User.IsInRole("MANAGER"))
+                        }
+                    </ul>
+                    @if (User.Identity.IsAuthenticated)
+                    {
+                        <ul class="navbar-nav">
+                            <li class="nav-item">
+                                <a class="nav-link text-dark">Logged in as @User.Identity.Name</a>
+                            </li>
+                            @if (User.IsInRole("ADMIN") || User.IsInRole("MANAGER"))
                             {
                                 <li class="nav-item">
                                     <a class="nav-link text-dark" asp-area="" asp-page="/Register">Create user</a>
@@ -45,8 +53,8 @@
                             <li class="nav-item">
                                 <a class="nav-link text-dark" asp-area="" asp-page="/Logout">Logout</a>
                             </li>
-                        }
-                    </ul>
+                        </ul>
+                    }
                 </div>
             </div>
         </nav>