diff --git a/StudentHouseDashboard/HouseData/Models/UserRole.cs b/StudentHouseDashboard/HouseData/Models/UserRole.cs
index 9cc1474..1496bee 100644
--- a/StudentHouseDashboard/HouseData/Models/UserRole.cs
+++ b/StudentHouseDashboard/HouseData/Models/UserRole.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using System.Text;
 
@@ -7,8 +8,11 @@ namespace StudentHouseDashboard.Models
 {
     public enum UserRole
     {
+        [Display(Name = "Tenant")]
         TENANT,
+        [Display(Name = "Manager")]
         MANAGER,
+        [Display(Name = "Administrator")]
         ADMIN
     }
 }
\ No newline at end of file
diff --git a/StudentHouseDashboard/WebApp/Pages/Announcements.cshtml b/StudentHouseDashboard/WebApp/Pages/Announcements.cshtml
index b610f09..a1be590 100644
--- a/StudentHouseDashboard/WebApp/Pages/Announcements.cshtml
+++ b/StudentHouseDashboard/WebApp/Pages/Announcements.cshtml
@@ -33,7 +33,7 @@
         @if (currentPage <= 1)
         {
             @: <li class="page-item disabled">
-            @: <a class="page-link" href="./Announcements?p=@(currentPage - 1)" tabindex="-1">Previous</a>
+            @: <a class="page-link" tabindex="-1">Previous</a>
             @: </li>
         }
         else  
@@ -44,16 +44,18 @@
             @: <li class="page-item"><a class="page-link" href="./Announcements?p=@(currentPage - 1)">@(currentPage - 1)</a></li>
         }
         <li class="page-item"><a class="page-link">@currentPage</a>
-        @if (announcements.Count == 0)
+        @if (announcements.Count == 0 || announcements.Count < Convert.ToInt32(ViewData["count"]))
         {
             @: <li class="page-item disabled">
+            @: <a class="page-link">Next</a>
+            @: </li>
         }
         else  
         {
             @: <li class="page-item"><a class="page-link" href="./Announcements?p=@(currentPage + 1)">@(currentPage + 1)</a></li>
             @: <li class="page-item">
+            @: <a class="page-link" href="./Announcements?p=@(currentPage + 1)">Next</a>
+            @: </li>
         }
-            <a class="page-link" href="./Announcements?p=@(currentPage + 1)">Next</a>
-        </li>
     </ul>
 </nav>
diff --git a/StudentHouseDashboard/WebApp/Pages/Announcements.cshtml.cs b/StudentHouseDashboard/WebApp/Pages/Announcements.cshtml.cs
index f20c5ee..38d37d9 100644
--- a/StudentHouseDashboard/WebApp/Pages/Announcements.cshtml.cs
+++ b/StudentHouseDashboard/WebApp/Pages/Announcements.cshtml.cs
@@ -18,8 +18,13 @@ namespace WebApp.Pages
             {
                 p = 1;
             }
+            if (c == null || c < 1)
+            {
+                c = 10;
+            }
             ViewData.Add("announcements", AnnouncementManager.GetAnnouncementsByPage(p - 1, c));
             ViewData.Add("page", p);
+            ViewData.Add("count", c);
             ViewData.Add("allCount", AnnouncementManager.GetAllAnnouncements().Count());
         }
     }
diff --git a/StudentHouseDashboard/WebApp/Pages/Register.cshtml b/StudentHouseDashboard/WebApp/Pages/Register.cshtml
index 86b7fd6..b371200 100644
--- a/StudentHouseDashboard/WebApp/Pages/Register.cshtml
+++ b/StudentHouseDashboard/WebApp/Pages/Register.cshtml
@@ -1,4 +1,5 @@
 @page
+@using StudentHouseDashboard.Models;
 @model WebApp.Pages.RegisterModel
 @{
     ViewData["Title"] = "Register";
@@ -14,10 +15,15 @@
 }
 
 <form method="post">
-    <div class="mb-3">
-        <label asp-for="MyUser.Role" class="form-label">Role: </label>
-        <input asp-for="MyUser.Role" class="form-control" />
-    </div>
+    @if (HttpContext.User.IsInRole("ADMIN") || HttpContext.User.IsInRole("MANAGER"))
+    {
+        @: <div class="mb-3">
+            <label asp-for="MyUser.Role" class="form-label">Role: </label>
+            <select asp-for="MyUser.Role" asp-items="Html.GetEnumSelectList<UserRole>()">
+                <option>Please select a role</option>
+            </select>
+        @: </div>
+    }
     <div class="mb-3">
         <label asp-for="MyUser.Name" class="form-label">Name: </label>
         <input asp-for="MyUser.Name" class="form-control" />