diff --git a/ServerCore/Pages/Puzzles/Create.cshtml b/ServerCore/Pages/Puzzles/Create.cshtml
index e2ef18ec..fe035c6f 100644
--- a/ServerCore/Pages/Puzzles/Create.cshtml
+++ b/ServerCore/Pages/Puzzles/Create.cshtml
@@ -24,49 +24,6 @@
                 <input asp-for="Puzzle.Name" class="form-control" />
                 <span asp-validation-for="Puzzle.Name" class="text-danger"></span>
             </div>
-            <div class="form-group">
-                <div class="checkbox">
-                    <label>
-                        <input asp-for="Puzzle.IsPuzzle" /> @Html.DisplayNameFor(model => model.Puzzle.IsPuzzle)
-                    </label>
-                </div>
-            </div>
-            <div class="form-group">
-                <div class="checkbox">
-                    <label>
-                        <input asp-for="Puzzle.IsMetaPuzzle" /> @Html.DisplayNameFor(model => model.Puzzle.IsMetaPuzzle)
-                    </label>
-                </div>
-            </div>
-            <div class="form-group">
-                <div class="checkbox">
-                    <label>
-                        <input asp-for="Puzzle.IsFinalPuzzle" /> @Html.DisplayNameFor(model => model.Puzzle.IsFinalPuzzle)
-                    </label>
-                </div>
-            </div>
-            <div class="form-group">
-                <div class="checkbox">
-                    <label>
-                        <input asp-for="Puzzle.IsCheatCode" /> @Html.DisplayNameFor(model => model.Puzzle.IsCheatCode)
-                    </label>
-                </div>
-            </div>
-            <div class="form-group">
-                <label asp-for="Puzzle.SolveValue" class="control-label"></label>
-                <input asp-for="Puzzle.SolveValue" class="form-control" />
-                <span asp-validation-for="Puzzle.SolveValue" class="text-danger"></span>
-            </div>
-            <div class="form-group">
-                <label asp-for="Puzzle.HintCoinsForSolve" class="control-label"></label>
-                <input asp-for="Puzzle.HintCoinsForSolve" class="form-control" />
-                <span asp-validation-for="Puzzle.HintCoinsForSolve" class="text-danger"></span>
-            </div>
-            <div class="form-group">
-                <label asp-for="Puzzle.Token" class="control-label"></label>
-                <input asp-for="Puzzle.Token" class="form-control" />
-                <span asp-validation-for="Puzzle.Token" class="text-danger"></span>
-            </div>
             <div class="form-group">
                 <label asp-for="Puzzle.Group" class="control-label"></label>
                 <input asp-for="Puzzle.Group" class="form-control" />
@@ -78,41 +35,9 @@
                 <span asp-validation-for="Puzzle.OrderInGroup" class="text-danger"></span>
             </div>
             <div class="form-group">
-                <div class="checkbox">
-                    <label>
-                        <input asp-for="Puzzle.IsGloballyVisiblePrerequisite" /> @Html.DisplayNameFor(model => model.Puzzle.IsGloballyVisiblePrerequisite)
-                    </label>
-                </div>
-            </div>
-            <div class="form-group">
-                <label asp-for="Puzzle.MinPrerequisiteCount" class="control-label"></label>
-                <input asp-for="Puzzle.MinPrerequisiteCount" class="form-control" />
-                <span asp-validation-for="Puzzle.MinPrerequisiteCount" class="text-danger"></span>
-            </div>
-            <div class="form-group">
-                <label asp-for="Puzzle.MinutesToAutomaticallySolve" class="control-label"></label>
-                <input asp-for="Puzzle.MinutesToAutomaticallySolve" class="form-control" />
-                <span asp-validation-for="Puzzle.MinutesToAutomaticallySolve" class="text-danger"></span>
-            </div>
-            <div class="form-group">
-                <label asp-for="Puzzle.MinutesOfEventLockout" class="control-label"></label>
-                <input asp-for="Puzzle.MinutesOfEventLockout" class="form-control" />
-                <span asp-validation-for="Puzzle.MinutesOfEventLockout" class="text-danger"></span>
-            </div>
-            <div class="form-group">
-                <label asp-for="Puzzle.MaxAnnotationKey" class="control-label"></label>
-                <input asp-for="Puzzle.MaxAnnotationKey" class="form-control" />
-                <span asp-validation-for="Puzzle.MaxAnnotationKey" class="text-danger"></span>
-            </div>
-            <div class="form-group">
-                <label asp-for="Puzzle.SupportEmailAlias" class="control-label"></label>
-                <input asp-for="Puzzle.SupportEmailAlias" class="form-control" />
-                <span asp-validation-for="Puzzle.SupportEmailAlias" class="text-danger"></span>
-            </div>
-            <div class="form-group">
-                <label asp-for="Puzzle.Description" class="control-label"></label>
-                <input asp-for="Puzzle.Description" class="form-control" />
-                <span asp-validation-for="Puzzle.Description" class="text-danger"></span>
+                <label asp-for="Puzzle.Type" class="control-label"></label>
+                <select asp-for="Puzzle.Type" asp-items="Html.GetEnumSelectList<CreateModel.PuzzleType>()"></select>
+                <span asp-validation-for="Puzzle.Type" class="text-danger"></span>
             </div>
             <div class="form-group">
                 <input type="submit" value="Create" class="btn btn-default" />
@@ -121,8 +46,6 @@
     </div>
 </div>
 
-
-
 @section Scripts {
     @{await Html.RenderPartialAsync("_ValidationScriptsPartial");}
 }
diff --git a/ServerCore/Pages/Puzzles/Create.cshtml.cs b/ServerCore/Pages/Puzzles/Create.cshtml.cs
index e424de70..e6d8483a 100644
--- a/ServerCore/Pages/Puzzles/Create.cshtml.cs
+++ b/ServerCore/Pages/Puzzles/Create.cshtml.cs
@@ -1,4 +1,5 @@
-using System.Threading.Tasks;
+using System.ComponentModel.DataAnnotations;
+using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
@@ -11,7 +12,7 @@ namespace ServerCore.Pages.Puzzles
     public class CreateModel : EventSpecificPageModel
     {
         [BindProperty]
-        public Puzzle Puzzle { get; set; }
+        public MiniPuzzle Puzzle { get; set; }
 
         public CreateModel(PuzzleServerContext serverContext, UserManager<IdentityUser> userManager) : base(serverContext, userManager)
         {
@@ -20,31 +21,83 @@ public CreateModel(PuzzleServerContext serverContext, UserManager<IdentityUser>
         public IActionResult OnGet()
         {
             // Populate default fields
-            Puzzle = new Puzzle();
-            Puzzle.IsPuzzle = true;
-            Puzzle.SolveValue = 10;
-            Puzzle.OrderInGroup = 0;
-            Puzzle.MinPrerequisiteCount = 0;
+            Puzzle = new MiniPuzzle();
 
             return Page();
         }
 
         public async Task<IActionResult> OnPostAsync()
         {
-            ModelState.Remove("Puzzle.Event");
             if (!ModelState.IsValid)
             {
                 return Page();
             }
 
-            Puzzle.Event = Event;
+            Puzzle p = new Puzzle();
 
-            _context.Puzzles.Add(Puzzle);
-            _context.PuzzleAuthors.Add(new PuzzleAuthors() { Puzzle = Puzzle, Author = LoggedInUser });
+            p.Event = Event;
+            p.Name = Puzzle.Name;
+            p.Group = Puzzle.Group;
+            p.OrderInGroup = Puzzle.OrderInGroup;
+
+            switch (Puzzle.Type)
+            {
+                case PuzzleType.FinalMetaPuzzle:
+                    p.IsFinalPuzzle = true;
+                    p.IsMetaPuzzle = true;
+                    p.IsPuzzle = true;
+                    p.SolveValue = 1000;
+                    p.MinPrerequisiteCount = 1;
+                    break;
+                case PuzzleType.MetaPuzzle:
+                    p.IsMetaPuzzle = true;
+                    p.IsPuzzle = true;
+                    p.SolveValue = 50;
+                    p.MinPrerequisiteCount = 1;
+                    break;
+                case PuzzleType.CheatCode:
+                    p.IsPuzzle = true;
+                    p.IsCheatCode = true;
+                    p.SolveValue = -1;
+                    p.MinPrerequisiteCount = 1;
+                    break;
+                case PuzzleType.NormalPuzzle:
+                    p.IsPuzzle = true;
+                    p.SolveValue = 10;
+                    p.MinPrerequisiteCount = 1;
+                    break;
+                case PuzzleType.InvisiblePuzzle:
+                    p.MinPrerequisiteCount = 1;
+                    break;
+                case PuzzleType.StartPuzzle:
+                    break;
+            }
+
+            _context.Puzzles.Add(p);
+            _context.PuzzleAuthors.Add(new PuzzleAuthors() { Puzzle = p, Author = LoggedInUser });
 
             await _context.SaveChangesAsync();
 
-            return RedirectToPage("./Index");
+            return RedirectToPage("./Edit", new { puzzleId = p.ID });
+        }
+
+        public class MiniPuzzle
+        {
+            [Required]
+            public string Name { get; set; }
+            public string Group { get; set; }
+            public int OrderInGroup { get; set; }
+            public PuzzleType Type { get; set; }
+        }
+
+        public enum PuzzleType
+        {
+            NormalPuzzle,
+            MetaPuzzle,
+            FinalMetaPuzzle,
+            CheatCode,
+            StartPuzzle,
+            InvisiblePuzzle
         }
     }
 }
\ No newline at end of file
diff --git a/ServerCore/Pages/Puzzles/Edit.cshtml b/ServerCore/Pages/Puzzles/Edit.cshtml
index 625e0d1f..28e0eaee 100644
--- a/ServerCore/Pages/Puzzles/Edit.cshtml
+++ b/ServerCore/Pages/Puzzles/Edit.cshtml
@@ -10,125 +10,135 @@
     Layout = "_puzzleManagementLayout.cshtml";
 }
 
-<h2>@Model.Puzzle.Name: Edit</h2>
-
-<div>
-    <a asp-page="./Details" asp-route-puzzleId="@Model.Puzzle.ID">Cancel</a>
-</div>
-
-<hr />
-<h3>Properties</h3>
 <div class="row">
-    <div class="col-md-4">
+    <div class="col-md-10">
         <form method="post" enctype="multipart/form-data">
+            <h3>@Model.Puzzle.Name: Properties <input type="submit" value="Save properties" class="btn btn-default btn-primary" /></h3>
             <div asp-validation-summary="ModelOnly" class="text-danger"></div>
             <input type="hidden" asp-for="Puzzle.ID" />
-            <div class="form-group">
-                <label asp-for="Puzzle.Name" class="control-label"></label>
-                <input asp-for="Puzzle.Name" class="form-control" />
-                <span asp-validation-for="Puzzle.Name" class="text-danger"></span>
-            </div>
-            <div class="form-group">
-                <div class="checkbox">
-                    <label>
-                        <input asp-for="Puzzle.IsPuzzle" /> @Html.DisplayNameFor(model => model.Puzzle.IsPuzzle)
-                    </label>
-                </div>
-            </div>
-            <div class="form-group">
-                <div class="checkbox">
-                    <label>
-                        <input asp-for="Puzzle.IsMetaPuzzle" /> @Html.DisplayNameFor(model => model.Puzzle.IsMetaPuzzle)
-                    </label>
-                </div>
-            </div>
-            <div class="form-group">
-                <div class="checkbox">
-                    <label>
-                        <input asp-for="Puzzle.IsFinalPuzzle" /> @Html.DisplayNameFor(model => model.Puzzle.IsFinalPuzzle)
-                    </label>
-                </div>
-            </div>
-            <div class="form-group">
-                <div class="checkbox">
-                    <label>
-                        <input asp-for="Puzzle.IsCheatCode" /> @Html.DisplayNameFor(model => model.Puzzle.IsCheatCode)
-                    </label>
-                </div>
-            </div>
-            <div class="form-group">
-                <label asp-for="Puzzle.SolveValue" class="control-label"></label>
-                <input asp-for="Puzzle.SolveValue" class="form-control" />
-                <span asp-validation-for="Puzzle.SolveValue" class="text-danger"></span>
-            </div>
-            <div class="form-group">
-                <label asp-for="Puzzle.HintCoinsForSolve" class="control-label"></label>
-                <input asp-for="Puzzle.HintCoinsForSolve" class="form-control" />
-                <span asp-validation-for="Puzzle.HintCoinsForSolve" class="text-danger"></span>
-            </div>
-            <div class="form-group">
-                <label asp-for="Puzzle.Token" class="control-label"></label>
-                <input asp-for="Puzzle.Token" class="form-control" />
-                <span asp-validation-for="Puzzle.Token" class="text-danger"></span>
-            </div>
-            <div class="form-group">
-                <label asp-for="Puzzle.Group" class="control-label"></label>
-                <input asp-for="Puzzle.Group" class="form-control" />
-                <span asp-validation-for="Puzzle.Group" class="text-danger"></span>
-            </div>
-            <div class="form-group">
-                <label asp-for="Puzzle.OrderInGroup" class="control-label"></label>
-                <input asp-for="Puzzle.OrderInGroup" class="form-control" />
-                <span asp-validation-for="Puzzle.OrderInGroup" class="text-danger"></span>
-            </div>
-            <div class="form-group">
-                <div class="checkbox">
-                    <label>
-                        <input asp-for="Puzzle.IsGloballyVisiblePrerequisite" /> @Html.DisplayNameFor(model => model.Puzzle.IsGloballyVisiblePrerequisite)
-                    </label>
-                </div>
-            </div>
-            <div class="form-group">
-                <label asp-for="Puzzle.MinPrerequisiteCount" class="control-label"></label>
-                <input asp-for="Puzzle.MinPrerequisiteCount" class="form-control" />
-                <span asp-validation-for="Puzzle.MinPrerequisiteCount" class="text-danger"></span>
-            </div>
-            <div class="form-group">
-                <label asp-for="Puzzle.MinutesToAutomaticallySolve" class="control-label"></label>
-                <input asp-for="Puzzle.MinutesToAutomaticallySolve" class="form-control" />
-                <span asp-validation-for="Puzzle.MinutesToAutomaticallySolve" class="text-danger"></span>
-            </div>
-            <div class="form-group">
-                <label asp-for="Puzzle.MinutesOfEventLockout" class="control-label"></label>
-                <input asp-for="Puzzle.MinutesOfEventLockout" class="form-control" />
-                <span asp-validation-for="Puzzle.MinutesOfEventLockout" class="text-danger"></span>
-            </div>
-            <div class="form-group">
-                <label asp-for="Puzzle.MaxAnnotationKey" class="control-label"></label>
-                <input asp-for="Puzzle.MaxAnnotationKey" class="form-control" />
-                <span asp-validation-for="Puzzle.MaxAnnotationKey" class="text-danger"></span>
-            </div>
-            <div class="form-group">
-                <label asp-for="Puzzle.SupportEmailAlias" class="control-label"></label>
-                <input asp-for="Puzzle.SupportEmailAlias" class="form-control" />
-                <span asp-validation-for="Puzzle.SupportEmailAlias" class="text-danger"></span>
-            </div>
-            <div class="form-group">
-                <label asp-for="Puzzle.CustomURL" class="control-label"></label>
-                <input asp-for="Puzzle.CustomURL" class="form-control" title="The URL for this puzzle to link to. You can use {eventId} for the current event and {puzzleId} for the current puzzle" />
-                <span asp-validation-for="Puzzle.CustomURL" class="text-danger"></span>
-            </div>
-            <div class="form-group">
-                <label asp-for="Puzzle.Description" class="control-label"></label>
-                <input asp-for="Puzzle.Description" class="form-control" />
-                <span asp-validation-for="Puzzle.Description" class="text-danger"></span>
-            </div>
-            <div class="form-group">
-                <input type="submit" value="Save" class="btn btn-default" />
-            </div>
+
+            <table class="table table-bordered">
+                <thead>
+                    <tr>
+                        <th>
+                            Basic
+                        </th>
+                        <th>
+                            Advanced
+                        </th>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tr>
+                        <td>
+                            <div class="form-group">
+                                <label asp-for="Puzzle.Name" class="control-label"></label>
+                                <input asp-for="Puzzle.Name" class="form-control" />
+                                <span asp-validation-for="Puzzle.Name" class="text-danger"></span>
+                            </div>
+                            <div class="form-group">
+                                <label asp-for="Puzzle.Group" class="control-label"></label>
+                                <input asp-for="Puzzle.Group" class="form-control" />
+                                <span asp-validation-for="Puzzle.Group" class="text-danger"></span>
+                            </div>
+                            <div class="form-group">
+                                <label asp-for="Puzzle.OrderInGroup" class="control-label"></label>
+                                <input asp-for="Puzzle.OrderInGroup" class="form-control" />
+                                <span asp-validation-for="Puzzle.OrderInGroup" class="text-danger"></span>
+                            </div>
+                            <div class="form-group">
+                                <div class="checkbox">
+                                    <label>
+                                        <input asp-for="Puzzle.IsPuzzle" /> @Html.DisplayNameFor(model => model.Puzzle.IsPuzzle)
+                                    </label>
+                                </div>
+                            </div>
+                            <div class="form-group">
+                                <div class="checkbox">
+                                    <label>
+                                        <input asp-for="Puzzle.IsMetaPuzzle" /> @Html.DisplayNameFor(model => model.Puzzle.IsMetaPuzzle)
+                                    </label>
+                                </div>
+                            </div>
+                            <div class="form-group">
+                                <div class="checkbox">
+                                    <label>
+                                        <input asp-for="Puzzle.IsFinalPuzzle" /> @Html.DisplayNameFor(model => model.Puzzle.IsFinalPuzzle)
+                                    </label>
+                                </div>
+                            </div>
+                            <div class="form-group">
+                                <div class="checkbox">
+                                    <label>
+                                        <input asp-for="Puzzle.IsCheatCode" /> @Html.DisplayNameFor(model => model.Puzzle.IsCheatCode)
+                                    </label>
+                                </div>
+                            </div>
+                            <div class="form-group">
+                                <label asp-for="Puzzle.SolveValue" class="control-label"></label>
+                                <input asp-for="Puzzle.SolveValue" class="form-control" />
+                                <span asp-validation-for="Puzzle.SolveValue" class="text-danger"></span>
+                            </div>
+                            <div class="form-group">
+                                <label asp-for="Puzzle.MinPrerequisiteCount" class="control-label"></label>
+                                <input asp-for="Puzzle.MinPrerequisiteCount" class="form-control" />
+                                <span asp-validation-for="Puzzle.MinPrerequisiteCount" class="text-danger"></span>
+                            </div>
+                            <div class="form-group">
+                                <label asp-for="Puzzle.SupportEmailAlias" class="control-label"></label>
+                                <input asp-for="Puzzle.SupportEmailAlias" class="form-control" />
+                                <span asp-validation-for="Puzzle.SupportEmailAlias" class="text-danger"></span>
+                            </div>
+                        </td>
+                        <td>
+                            <div class="form-group">
+                                <div class="checkbox">
+                                    <label>
+                                        <input asp-for="Puzzle.IsGloballyVisiblePrerequisite" /> @Html.DisplayNameFor(model => model.Puzzle.IsGloballyVisiblePrerequisite)
+                                    </label>
+                                </div>
+                            </div>
+                            <div class="form-group">
+                                <label asp-for="Puzzle.HintCoinsForSolve" class="control-label"></label>
+                                <input asp-for="Puzzle.HintCoinsForSolve" class="form-control" />
+                                <span asp-validation-for="Puzzle.HintCoinsForSolve" class="text-danger"></span>
+                            </div>
+                            <div class="form-group">
+                                <label asp-for="Puzzle.Token" class="control-label"></label>
+                                <input asp-for="Puzzle.Token" class="form-control" />
+                                <span asp-validation-for="Puzzle.Token" class="text-danger"></span>
+                            </div>
+                            <div class="form-group">
+                                <label asp-for="Puzzle.MinutesToAutomaticallySolve" class="control-label"></label>
+                                <input asp-for="Puzzle.MinutesToAutomaticallySolve" class="form-control" />
+                                <span asp-validation-for="Puzzle.MinutesToAutomaticallySolve" class="text-danger"></span>
+                            </div>
+                            <div class="form-group">
+                                <label asp-for="Puzzle.MinutesOfEventLockout" class="control-label"></label>
+                                <input asp-for="Puzzle.MinutesOfEventLockout" class="form-control" />
+                                <span asp-validation-for="Puzzle.MinutesOfEventLockout" class="text-danger"></span>
+                            </div>
+                            <div class="form-group">
+                                <label asp-for="Puzzle.MaxAnnotationKey" class="control-label"></label>
+                                <input asp-for="Puzzle.MaxAnnotationKey" class="form-control" />
+                                <span asp-validation-for="Puzzle.MaxAnnotationKey" class="text-danger"></span>
+                            </div>
+                            <div class="form-group">
+                                <label asp-for="Puzzle.CustomURL" class="control-label"></label>
+                                <input asp-for="Puzzle.CustomURL" class="form-control" title="The URL for this puzzle to link to. You can use {eventId} for the current event and {puzzleId} for the current puzzle" />
+                                <span asp-validation-for="Puzzle.CustomURL" class="text-danger"></span>
+                            </div>
+                            <div class="form-group">
+                                <label asp-for="Puzzle.Description" class="control-label"></label>
+                                <input asp-for="Puzzle.Description" class="form-control" />
+                                <span asp-validation-for="Puzzle.Description" class="text-danger"></span>
+                            </div>
+                        </td>
+                    </tr>
+                </tbody>
+            </table>
         </form>
-        <hr />
-        <h3>Prerequisites</h3>
+        <h3>@Model.Puzzle.Name: Prerequisites</h3>
         <h4>These puzzles help to unlock me:</h4>
         <form method="post" enctype="multipart/form-data">
             <input type="hidden" asp-for="Puzzle.ID" />
@@ -196,8 +206,8 @@
                 </tbody>
             </table>
         </form>
-		<hr/>
-        <h3>Authors</h3>
+        <hr />
+        <h3>@Model.Puzzle.Name: Authors</h3>
         <form method="post" enctype="multipart/form-data">
             <input type="hidden" asp-for="Puzzle.ID" />
             <table>