diff --git a/ServerCore/ModelBases/EventSpecificPageModel.cs b/ServerCore/ModelBases/EventSpecificPageModel.cs
index b779b61c..17571fa3 100644
--- a/ServerCore/ModelBases/EventSpecificPageModel.cs
+++ b/ServerCore/ModelBases/EventSpecificPageModel.cs
@@ -86,6 +86,10 @@ public async Task BindModelAsync(ModelBindingContext bindingContext)
                 {
                     bindingContext.Result = ModelBindingResult.Success(Enum.Parse(typeof(EventRole), eventRoleAsString));
                 }
+                else
+                {
+                    throw new Exception("Invalid route parameter '" + eventRoleAsString + "'. Please check your URL to make sure you are using the correct path. (code: InvalidRoleId)");
+                }
             }
         }
     }
diff --git a/ServerCore/Pages/Hints/Create.cshtml b/ServerCore/Pages/Hints/Create.cshtml
index 196937a3..950ad218 100644
--- a/ServerCore/Pages/Hints/Create.cshtml
+++ b/ServerCore/Pages/Hints/Create.cshtml
@@ -1,4 +1,4 @@
-@page "/{eventId}/Hints/Create/{puzzleId}"
+@page "/{eventId}/{eventRole}/Hints/Create/{puzzleId}"
 @model ServerCore.Pages.Hints.CreateModel
 
 @{
diff --git a/ServerCore/Pages/Hints/Delete.cshtml b/ServerCore/Pages/Hints/Delete.cshtml
index d1269ccc..a998bb15 100644
--- a/ServerCore/Pages/Hints/Delete.cshtml
+++ b/ServerCore/Pages/Hints/Delete.cshtml
@@ -1,4 +1,4 @@
-@page "/{eventId}/Hints/Delete/{puzzleId}"
+@page "/{eventId}/{eventRole}/Hints/Delete/{puzzleId}"
 @model ServerCore.Pages.Hints.DeleteModel
 
 @{
diff --git a/ServerCore/Pages/Hints/Details.cshtml b/ServerCore/Pages/Hints/Details.cshtml
index ba4aae2d..0aaa1f04 100644
--- a/ServerCore/Pages/Hints/Details.cshtml
+++ b/ServerCore/Pages/Hints/Details.cshtml
@@ -1,4 +1,4 @@
-@page "/{eventId}/Hints/Details/{puzzleId}"
+@page "/{eventId}/{eventRole}/Hints/Details/{puzzleId}"
 @model ServerCore.Pages.Hints.DetailsModel
 
 @{
diff --git a/ServerCore/Pages/Hints/Edit.cshtml b/ServerCore/Pages/Hints/Edit.cshtml
index c1ef8e4d..10c67533 100644
--- a/ServerCore/Pages/Hints/Edit.cshtml
+++ b/ServerCore/Pages/Hints/Edit.cshtml
@@ -1,4 +1,4 @@
-@page "/{eventId}/Hints/Edit/{puzzleId}"
+@page "/{eventId}/{eventRole}/Hints/Edit/{puzzleId}"
 @model ServerCore.Pages.Hints.EditModel
 
 @{
diff --git a/ServerCore/Pages/Hints/Index.cshtml b/ServerCore/Pages/Hints/Index.cshtml
index d1a9926e..20aa295a 100644
--- a/ServerCore/Pages/Hints/Index.cshtml
+++ b/ServerCore/Pages/Hints/Index.cshtml
@@ -1,4 +1,4 @@
-@page "/{eventId}/Hints/{puzzleID}"
+@page "/{eventId}/{eventRole}/Hints/{puzzleID}"
 @model ServerCore.Pages.Hints.IndexModel
 
 @{
diff --git a/ServerCore/Pages/Shared/_Layout.cshtml b/ServerCore/Pages/Shared/_Layout.cshtml
index 67e4b749..3189d8ad 100644
--- a/ServerCore/Pages/Shared/_Layout.cshtml
+++ b/ServerCore/Pages/Shared/_Layout.cshtml
@@ -169,7 +169,7 @@
                             <span class="icon-bar"></span>
                         </button>
                         <a asp-page="/." class="navbar-brand" data-toggle="dropdown">
-                            Admin
+                            @Event.Name - Admin
                         </a>
                         <!-- Get this to work & add it to the other header bars
                         <ul class="dropdown-menu">
@@ -220,7 +220,7 @@
                             <span class="icon-bar"></span>
                         </button>
                         <a asp-page="/Index" class="navbar-brand">
-                            Author
+                            @Event.Name - Author
                         </a>
                     </div>
                     <div class="navbar-collapse collapse">
@@ -263,14 +263,14 @@
                             <span class="icon-bar"></span>
                         </button>
                         <a asp-page="/Index" class="navbar-brand">
-                            Player
+                            @Event.Name
                         </a>
                     </div>
                     <div class="navbar-collapse collapse">
                         <ul class="nav navbar-nav">
                             <li><a asp-page="/Events/Details" asp-route-id="@Event.ID" asp-route-eventRole="@ModelBases.EventRole.play">Event</a></li>
                             <li><a asp-page="/Puzzles/Index" asp-route-eventId="@Event.ID" asp-route-eventRole="@ModelBases.EventRole.play">Puzzles</a></li>
-                            <li><a asp-page="/Teams/Index" asp-route-eventId="@Event.ID" asp-route-eventRole="@ModelBases.EventRole.play">Team</a></li>
+                            <li><a asp-page="/Teams/Details" asp-route-eventId="@Event.ID" asp-route-eventRole="@ModelBases.EventRole.play">Team</a></li>
                             <li><a asp-page="/Events/Standings" asp-route-eventId="@Event.ID" asp-route-eventRole="@ModelBases.EventRole.play">Standings</a></li>
                             <li class="dropdown">
                                 <a class="dropdown-toggle" data-toggle="dropdown" href="#">
diff --git a/ServerCore/Pages/Submissions/AuthorIndex.cshtml b/ServerCore/Pages/Submissions/AuthorIndex.cshtml
index a267ccfc..7684e9bc 100644
--- a/ServerCore/Pages/Submissions/AuthorIndex.cshtml
+++ b/ServerCore/Pages/Submissions/AuthorIndex.cshtml
@@ -1,4 +1,4 @@
-@page "/{eventId}/AuthorSubmissions"
+@page "/{eventId}/{eventRole}/AuthorSubmissions"
 @model ServerCore.Pages.Submissions.AuthorIndexModel
 @{
     ViewData["Title"] = "AuthorIndex";
diff --git a/ServerCore/Pages/Teams/AddMember.cshtml b/ServerCore/Pages/Teams/AddMember.cshtml
index ce4b0146..f3aef310 100644
--- a/ServerCore/Pages/Teams/AddMember.cshtml
+++ b/ServerCore/Pages/Teams/AddMember.cshtml
@@ -6,9 +6,13 @@
     Layout = "_teamLayout.cshtml";
 }
 
-<h2>Add a team member</h2>
+<h2>@Html.DisplayFor(model => model.Team.Name) - Add Member</h2>
 
-<h4>Select a user to add to team "@Model.MyTeam.Name"</h4>
+<div>
+    <a asp-page="./Members" asp-route-id="@Model.Team.ID">Cancel</a>
+</div>
+
+<h4>Select a user to add to this team:</h4>
 
 <table class="table">
     <thead>
@@ -39,18 +43,9 @@
                     @Html.DisplayFor(modelItem => item.Email)
                 </td>
                 <td>
-                    <a asp-page-handler="AddMember" asp-route-teamId="@Model.MyTeam.ID" asp-route-userId="@item.ID">Add</a>
+                    <a asp-page-handler="AddMember" asp-route-teamId="@Model.Team.ID" asp-route-userId="@item.ID">Add</a>
                 </td>
             </tr>
         }
     </tbody>
-</table>
-
-<div>
-    TEMPORARY - use this to add a random user so you can use this page. TODO: Remove once users have their own add page
-    <a asp-page-handler="AddUser" asp-route-teamId="@Model.MyTeam.ID">TEMP add user</a>
-</div>
-
-<div>
-    <a asp-page="Members" asp-route-id="@Model.MyTeam.ID">Back to team member list</a>
-</div>
\ No newline at end of file
+</table>
\ No newline at end of file
diff --git a/ServerCore/Pages/Teams/AddMember.cshtml.cs b/ServerCore/Pages/Teams/AddMember.cshtml.cs
index cef3ab26..427a12c7 100644
--- a/ServerCore/Pages/Teams/AddMember.cshtml.cs
+++ b/ServerCore/Pages/Teams/AddMember.cshtml.cs
@@ -15,7 +15,7 @@ public class AddMemberModel : EventSpecificPageModel
     {
         private readonly ServerCore.DataModel.PuzzleServerContext _context;
 
-        public Team MyTeam { get; set; }
+        public Team Team { get; set; }
 
         public IList<PuzzleUser> Users { get; set; }
 
@@ -26,8 +26,8 @@ public AddMemberModel(ServerCore.DataModel.PuzzleServerContext context)
 
         public async Task<IActionResult> OnGetAsync(int teamId)
         {
-            MyTeam = await _context.Teams.FirstOrDefaultAsync(m => m.ID == teamId);
-            if (MyTeam == null)
+            Team = await _context.Teams.FirstOrDefaultAsync(m => m.ID == teamId);
+            if (Team == null)
             {
                 return NotFound("Could not find team with ID '" + teamId + "'. Check to make sure you're accessing this page in the context of a team.");
             }
@@ -67,22 +67,5 @@ public async Task<IActionResult> OnGetAddMemberAsync(int teamId, int userId)
             await _context.SaveChangesAsync();
             return RedirectToPage("./Members", new { id = teamId });
         }
-
-        // TEMPORARY - can't test member add without this function to add random users
-        // TODO (@Jenna) - delete once users have an add page
-        public async Task<IActionResult> OnGetAddUserAsync(int teamId)
-        {
-            PuzzleUser User = new PuzzleUser();
-            User.Name = "MyName" + new Random().Next(1, 99);
-            User.EmployeeAlias = "null";
-            User.Email = User.Name + "@domain.com";
-            User.PhoneNumber = "null";
-            User.TShirtSize = "null";
-            User.VisibleToOthers = true;
-            _context.PuzzleUsers.Add(User);
-
-            await _context.SaveChangesAsync();
-            return RedirectToPage("./AddMember", new { teamId });
-        }
     }
 }
\ No newline at end of file
diff --git a/ServerCore/Pages/Teams/Create.cshtml b/ServerCore/Pages/Teams/Create.cshtml
index 2eb259d5..2944e5c8 100644
--- a/ServerCore/Pages/Teams/Create.cshtml
+++ b/ServerCore/Pages/Teams/Create.cshtml
@@ -5,7 +5,7 @@
     ViewData["Title"] = "Create";
 }
 
-<h2>Create</h2>
+<h2>Create a new team</h2>
 
 <h4>Team</h4>
 <hr />
diff --git a/ServerCore/Pages/Teams/Delete.cshtml b/ServerCore/Pages/Teams/Delete.cshtml
index 7a43c5ba..a9fe865c 100644
--- a/ServerCore/Pages/Teams/Delete.cshtml
+++ b/ServerCore/Pages/Teams/Delete.cshtml
@@ -6,7 +6,10 @@
     Layout = "_teamLayout.cshtml";
 }
 
-<h2>Delete</h2>
+<h2>@Html.DisplayFor(model => model.Team.Name) - Delete</h2>
+<div>
+    <a asp-page="./Details" asp-route-id="@Model.Team.ID">Cancel</a>
+</div>
 
 <h3>Are you sure you want to delete this?</h3>
 <div>
diff --git a/ServerCore/Pages/Teams/Details.cshtml b/ServerCore/Pages/Teams/Details.cshtml
index 8828c518..826916cc 100644
--- a/ServerCore/Pages/Teams/Details.cshtml
+++ b/ServerCore/Pages/Teams/Details.cshtml
@@ -6,10 +6,16 @@
     Layout = "_teamLayout.cshtml";
 }
 
-<h2>Details</h2>
+<h2>@Html.DisplayFor(model => model.Team.Name) - Details</h2>
 
 <div>
-    <h4>Team</h4>
+    @if(Model.EventRole != ModelBases.EventRole.author)
+    {
+        <div>
+            <a asp-page="./Edit" asp-route-id="@Model.Team.ID">Edit</a> |
+            <a asp-page="./Delete">Delete</a>
+        </div>
+    }
     <hr />
     <dl class="dl-horizontal">
         <dt>
@@ -50,7 +56,3 @@
         </dd>
     </dl>
 </div>
-<div>
-    <a asp-page="./Edit" asp-route-id="@Model.Team.ID">Edit</a> |
-    <a asp-page="./Index">Back to List</a>
-</div>
diff --git a/ServerCore/Pages/Teams/Details.cshtml.cs b/ServerCore/Pages/Teams/Details.cshtml.cs
index 4a581684..750efc5b 100644
--- a/ServerCore/Pages/Teams/Details.cshtml.cs
+++ b/ServerCore/Pages/Teams/Details.cshtml.cs
@@ -1,4 +1,5 @@
 using System.Threading.Tasks;
+using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 using ServerCore.DataModel;
@@ -9,21 +10,31 @@ namespace ServerCore.Pages.Teams
     public class DetailsModel : EventSpecificPageModel
     {
         private readonly PuzzleServerContext _context;
+        private readonly UserManager<IdentityUser> userManager;
 
-        public DetailsModel(PuzzleServerContext context)
+        public DetailsModel(PuzzleServerContext context, UserManager<IdentityUser> manager)
         {
             _context = context;
+            userManager = manager;
         }
 
         public Team Team { get; set; }
 
-        public async Task<IActionResult> OnGetAsync(int id)
+        public async Task<IActionResult> OnGetAsync(int id=-1)
         {
+            if (id == -1)
+            {
+                if (EventRole != ModelBases.EventRole.play)
+                {
+                    return NotFound("Missing team id");
+                }
+                id = 1;// TODO - fix to get the user's team loggedInUser.teamId;
+            }
             Team = await _context.Teams.FirstOrDefaultAsync(m => m.ID == id);
 
             if (Team == null)
             {
-                return NotFound();
+                return NotFound("No team found with id '" + id + "'.");
             }
             return Page();
         }
diff --git a/ServerCore/Pages/Teams/Edit.cshtml b/ServerCore/Pages/Teams/Edit.cshtml
index 66e1619f..ca9ffabd 100644
--- a/ServerCore/Pages/Teams/Edit.cshtml
+++ b/ServerCore/Pages/Teams/Edit.cshtml
@@ -6,7 +6,10 @@
     Layout = "_teamLayout.cshtml";
 }
 
-<h2>Edit</h2>
+<h2>@Html.DisplayFor(model => model.Team.Name) - Edit</h2>
+<div>
+    <a asp-page="./Details" asp-route-id="@Model.Team.ID">Cancel</a>
+</div>
 
 <h4>Team</h4>
 <hr />
@@ -51,10 +54,6 @@
     </div>
 </div>
 
-<div>
-    <a asp-page="./Index">Back to List</a>
-</div>
-
 @section Scripts {
     @{await Html.RenderPartialAsync("_ValidationScriptsPartial");}
 }
diff --git a/ServerCore/Pages/Teams/Hints.cshtml b/ServerCore/Pages/Teams/Hints.cshtml
index 7a213f50..793304c9 100644
--- a/ServerCore/Pages/Teams/Hints.cshtml
+++ b/ServerCore/Pages/Teams/Hints.cshtml
@@ -1,4 +1,4 @@
-@page "/{eventId}/Teams/Hints"
+@page "/{eventId}/{eventRole}/Teams/Hints"
 @model ServerCore.Pages.Teams.HintsModel
 
 @{
diff --git a/ServerCore/Pages/Teams/Index.cshtml b/ServerCore/Pages/Teams/Index.cshtml
index 88d17d00..8155fe78 100644
--- a/ServerCore/Pages/Teams/Index.cshtml
+++ b/ServerCore/Pages/Teams/Index.cshtml
@@ -65,12 +65,15 @@
                 @Html.DisplayFor(modelItem => item.SecondaryPhoneNumber)
             </td>
             <td>
-                <a asp-page="./Edit" asp-route-id="@item.ID">Edit</a> |
-                <a asp-page="./Details" asp-route-id="@item.ID">Details</a> |
-                <a asp-page="./Delete" asp-route-id="@item.ID">Delete</a> |
-                <a asp-page="./Play" asp-route-id="@item.ID">Play</a> |
-                <a asp-page="./Status" asp-route-id="@item.ID">Status</a> |
-                <a asp-page="./Members" asp-route-id="@item.ID">Members</a>
+                <a asp-page="./Status" asp-route-id="@item.ID">Status</a>
+                @if (Model.EventRole == ModelBases.EventRole.admin)
+                {
+                <div>
+                    |
+                    <a asp-page="./Details" asp-route-id="@item.ID">View</a> |
+                    <a asp-page="./Members" asp-route-id="@item.ID">Members</a>
+                </div>
+                }
             </td>
         </tr>
 }
diff --git a/ServerCore/Pages/Teams/Members.cshtml b/ServerCore/Pages/Teams/Members.cshtml
index 4b105ab2..57c3333a 100644
--- a/ServerCore/Pages/Teams/Members.cshtml
+++ b/ServerCore/Pages/Teams/Members.cshtml
@@ -5,10 +5,11 @@
     Layout = "_teamLayout.cshtml";
 }
 
-<h2>Team Members</h2>
+<h2>@Html.DisplayFor(model => model.Team.Name) - Members</h2>
 
-<h4>Team: @Model.Team.Name</h4>
-<h4>ID: @Model.Team.ID</h4>
+<div>
+    <a asp-page="./AddMember" asp-route-teamId="@Model.Team.ID">Add a member</a>
+</div>
 
 <table class="table">
     <thead>
@@ -50,10 +51,3 @@
 
 <p>@Model.Emails</p>
 
-<div>
-    <a asp-page="./AddMember" asp-route-teamId="@Model.Team.ID">Add a member</a>
-</div>
-
-<div>
-    <a asp-page="./Index">Back to team list</a>
-</div>
\ No newline at end of file
diff --git a/ServerCore/Pages/Teams/Members.cshtml.cs b/ServerCore/Pages/Teams/Members.cshtml.cs
index 5626880a..dd1417d0 100644
--- a/ServerCore/Pages/Teams/Members.cshtml.cs
+++ b/ServerCore/Pages/Teams/Members.cshtml.cs
@@ -38,7 +38,7 @@ public async Task<IActionResult> OnGetAsync(int id)
             StringBuilder emailList = new StringBuilder("");
             foreach (TeamMembers Member in Members)
             {
-                emailList.Append(Member.Member.Email + "; ");
+                //TODO - figure out why this isn't working: emailList.Append(Member.Member.Email + "; ");
             }
             Emails = emailList.ToString();
 
diff --git a/ServerCore/Pages/Teams/Status.cshtml b/ServerCore/Pages/Teams/Status.cshtml
index 0bc34529..c5603cd1 100644
--- a/ServerCore/Pages/Teams/Status.cshtml
+++ b/ServerCore/Pages/Teams/Status.cshtml
@@ -6,7 +6,7 @@
     Layout = "_teamLayout.cshtml";
 }
 
-<h2>Puzzle Status for @Model.Team.Name</h2>
+<h2>@Html.DisplayFor(model => model.Team.Name) - Status</h2>
 
 <table class="table">
     <thead>
diff --git a/ServerCore/Pages/Teams/_teamLayout.cshtml b/ServerCore/Pages/Teams/_teamLayout.cshtml
index 6e06c476..5d8f8435 100644
--- a/ServerCore/Pages/Teams/_teamLayout.cshtml
+++ b/ServerCore/Pages/Teams/_teamLayout.cshtml
@@ -2,13 +2,28 @@
 
 @{ Layout = "../Shared/_Layout.cshtml"; }
 
-Current team ID: @Model.Team.ID    ||
-<a asp-page="./Index">Back to team list</a>    ||
-<a asp-page="./Edit" asp-route-id="@Model.Team.ID">Edit</a>    |
-<a asp-page="./Details" asp-route-id="@Model.Team.ID">Details</a>    |
-<a asp-page="./Delete" asp-route-id="@Model.Team.ID">Delete</a>    |
-<a asp-page="./Status" asp-route-id="@Model.Team.ID">Status</a>    |
-<a asp-page="./Members" asp-route-id="@Model.Team.ID">Members</a>
+@if (Model.EventRole == ModelBases.EventRole.admin)
+{
+    <div>
+        <a asp-page="./Index">Back to team list</a> ||
+        <a asp-page="./Details" asp-route-id="@Model.Team.ID">Details</a> |
+        <a asp-page="./Members" asp-route-id="@Model.Team.ID">Members</a> |
+        <a asp-page="./Status" asp-route-id="@Model.Team.ID">Status</a>
+    </div>
+}
+@if (Model.EventRole == ModelBases.EventRole.author)
+{
+    <div>
+        <a asp-page="./Index">Back to team list</a>
+    </div>
+}
+@if (Model.EventRole == ModelBases.EventRole.play)
+{
+    <div>
+        <a asp-page="./Details" asp-route-id="@Model.Team.ID">Details</a> |
+        <a asp-page="./Members" asp-route-id="@Model.Team.ID">Members</a>
+    </div>
+}
 
 <body>
     <div>