diff --git a/Data/DataModel/Feedback.cs b/Data/DataModel/Feedback.cs
index 09fbc95c..7500296a 100644
--- a/Data/DataModel/Feedback.cs
+++ b/Data/DataModel/Feedback.cs
@@ -9,15 +9,48 @@ namespace ServerCore.DataModel
 {
     public class Feedback
     {
+        public Feedback()
+        {
+            Fun = AvgRating;
+            Difficulty = AvgRating;
+        }
+
+        public const int MinRating = 1;
+        public const int AvgRating = 5;
+        public const int MaxRating = 10;
+
         [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
         public int ID { get; set; }
+
         [Required]
         public virtual Puzzle Puzzle { get; set; }
+
+        /// <summary>
+        /// The user who submitted the feedback>
+        /// </summary>
         [Required]
         public virtual PuzzleUser Submitter {get; set;}
+
+        /// <summary>
+        /// The time the feedback was submitted.
+        /// </summary>
         public DateTime SubmissionTime { get; set; }
+
+        /// <summary>
+        /// The feedback text submitted by the user.
+        /// </summary>
         public string WrittenFeedback { get; set; }
+
+        /// <summary>
+        /// The user submitted difficulty score for the puzzle.
+        /// </summary>
+        [Range(MinRating, MaxRating)]
         public int Difficulty { get; set; }
+
+        /// <summary>
+        /// The user submitted fun score for the puzzle.
+        /// </summary>
+        [Range(MinRating, MaxRating)]
         public int Fun { get; set; }
     }
 }
diff --git a/ServerCore/Pages/Puzzles/Feedback.cshtml b/ServerCore/Pages/Puzzles/Feedback.cshtml
index b9417904..c0dba311 100644
--- a/ServerCore/Pages/Puzzles/Feedback.cshtml
+++ b/ServerCore/Pages/Puzzles/Feedback.cshtml
@@ -26,6 +26,9 @@
             <th>
                 @Html.DisplayNameFor(model => model.Feedbacks[0].Submitter)
             </th>
+            <th>
+                @Html.DisplayNameFor(model => model.Feedbacks[0].Submitter.Email)
+            </th>
             <th>
                 @Html.DisplayNameFor(model => model.Feedbacks[0].SubmissionTime)
             </th>
@@ -46,6 +49,9 @@
             <td>
                 @Html.DisplayFor(modelItem => item.Submitter.Name)
             </td>
+            <td>
+                @Html.DisplayFor(modelItem => item.Submitter.Email)
+            </td>
             <td>
                 @Html.DisplayFor(modelItem => item.SubmissionTime)
             </td>
diff --git a/ServerCore/Pages/Puzzles/SubmitFeedback.cshtml b/ServerCore/Pages/Puzzles/SubmitFeedback.cshtml
index bbd4e967..fedde5c2 100644
--- a/ServerCore/Pages/Puzzles/SubmitFeedback.cshtml
+++ b/ServerCore/Pages/Puzzles/SubmitFeedback.cshtml
@@ -26,7 +26,7 @@
             </div>
             <div class="form-group">
                 <label asp-for="Feedback.Difficulty" class="control-label"></label>
-                <input asp-for="Feedback.Difficulty" type="range" min="@Model.MinRating" max="@Model.MaxRating" step="1" class="slider" id="difficultySlider">
+                <input asp-for="Feedback.Difficulty" type="range" min="@DataModel.Feedback.MinRating" max="@DataModel.Feedback.MaxRating" step="1" class="slider" id="difficultySlider">
                 <label id="difficultyLabel">NULL</label>
                 <script>
                     var diffslider = document.getElementById("difficultySlider");
@@ -41,7 +41,7 @@
             </div>
             <div class="form-group">
                 <label asp-for="Feedback.Fun" class="control-label"></label>
-                <input asp-for="Feedback.Fun" type="range" min="@Model.MinRating" max="@Model.MaxRating" step="1" class="slider" id="funSlider">
+                <input asp-for="Feedback.Fun" type="range" min="@DataModel.Feedback.MinRating" max="@DataModel.Feedback.MaxRating" step="1" class="slider" id="funSlider">
                 <label id="funLabel">NULL</label>
                 <script>
                     var funslider = document.getElementById("funSlider");
diff --git a/ServerCore/Pages/Puzzles/SubmitFeedback.cshtml.cs b/ServerCore/Pages/Puzzles/SubmitFeedback.cshtml.cs
index d450858c..3174375f 100644
--- a/ServerCore/Pages/Puzzles/SubmitFeedback.cshtml.cs
+++ b/ServerCore/Pages/Puzzles/SubmitFeedback.cshtml.cs
@@ -20,8 +20,6 @@ public SubmitFeedbackModel(PuzzleServerContext serverContext, UserManager<Identi
         [BindProperty]
         public Feedback Feedback { get; set; }  
         public Puzzle Puzzle { get; set; }
-        public int MinRating = 1;
-        public int MaxRating = 10;
 
         /// <summary>
         /// Gets the submit feedback page for a puzzle
@@ -36,12 +34,14 @@ public async Task<IActionResult> OnGetAsync(int puzzleId)
             }
 
             // Seed existing feedback page
-            Feedback = await _context.Feedback.Where((f) => f.Puzzle.ID == puzzleId && f.Submitter == LoggedInUser).FirstOrDefaultAsync();
+            Feedback = await _context.Feedback
+                .Where((f) => (f.Puzzle.ID == puzzleId &&
+                               f.Submitter == LoggedInUser))
+                .FirstOrDefaultAsync();
+
             if (Feedback == null)
             {
                 Feedback = new Feedback();
-                Feedback.Fun = 5;
-                Feedback.Difficulty = 5;
             }
 
             return Page();
@@ -59,16 +59,19 @@ public async Task<IActionResult> OnPostAsync(int puzzleId)
                 return Page();
             }
 
-            if (Feedback.Fun < MinRating)
-                Feedback.Fun = MinRating;
-            if (Feedback.Fun > MaxRating)
-                Feedback.Fun = MaxRating;
-            if (Feedback.Difficulty < MinRating)
-                Feedback.Difficulty = MinRating;
-            if (Feedback.Difficulty > MaxRating)
-                Feedback.Difficulty = MaxRating;
+            Feedback.Fun = Math.Clamp(Feedback.Fun,
+                                      Feedback.MinRating,
+                                      Feedback.MaxRating);
+
+            Feedback.Difficulty = Math.Clamp(Feedback.Difficulty,
+                                             Feedback.MinRating,
+                                             Feedback.MaxRating);
+
+            Feedback editableFeedback = await _context.Feedback
+                .Where((f) => (f.Puzzle.ID == puzzleId && 
+                               f.Submitter == LoggedInUser))
+                .FirstOrDefaultAsync();
 
-            Feedback editableFeedback = await _context.Feedback.Where((f) => f.Puzzle.ID == puzzleId && f.Submitter == LoggedInUser).FirstOrDefaultAsync();
             if (editableFeedback == null)
             {
                 Feedback.SubmissionTime = DateTime.UtcNow;
@@ -87,11 +90,15 @@ public async Task<IActionResult> OnPostAsync(int puzzleId)
                 editableFeedback.Difficulty = Feedback.Difficulty;
                 editableFeedback.Fun = Feedback.Fun;
                 editableFeedback.WrittenFeedback = Feedback.WrittenFeedback;
-                editableFeedback.Puzzle = await _context.Puzzles.Where(m => m.ID == puzzleId).FirstOrDefaultAsync();
+                editableFeedback.Puzzle = await _context.Puzzles
+                    .Where(m => m.ID == puzzleId)
+                    .FirstOrDefaultAsync();
+
                 if (editableFeedback.Puzzle == null)
                 {
                     return NotFound();
                 }
+
                 _context.Attach(editableFeedback).State = EntityState.Modified;
             }