diff --git a/FIT5032-Assignment/Controllers/System.cs b/FIT5032-Assignment/Controllers/System.cs
index 5fc324b..b432e30 100644
--- a/FIT5032-Assignment/Controllers/System.cs
+++ b/FIT5032-Assignment/Controllers/System.cs
@@ -13,9 +13,18 @@ namespace FIT5032_Assignment.Controllers {
       if (!System.IO.File.Exists(filePath)) {
         return HttpNotFound();
       }
-      var fileContent = System.IO.File.ReadAllText(filePath);
-      var contentType = MimeMapping.GetMimeMapping(fileName);
-      return File(fileContent, contentType);
+      // Read binary data from the file
+      byte[] fileBytes = System.IO.File.ReadAllBytes(filePath);
+
+      // The binary file may png, jpg or jpeg
+      var fileExtension = Path.GetExtension(filePath).ToLowerInvariant();
+      // Set the MIME type
+      if (fileExtension == ".png") {
+        return File(fileBytes, "image/png");
+      } else if (fileExtension == ".jpg" || fileExtension == ".jpeg") {
+        return File(fileBytes, "image/jpeg");
+      }
+      return HttpNotFound();
     }
   }
 }
\ No newline at end of file
diff --git a/FIT5032-Assignment/Views/Appointments/Detail.cshtml b/FIT5032-Assignment/Views/Appointments/Detail.cshtml
index b718131..65710a2 100644
--- a/FIT5032-Assignment/Views/Appointments/Detail.cshtml
+++ b/FIT5032-Assignment/Views/Appointments/Detail.cshtml
@@ -48,10 +48,26 @@
   <div class="field">
     <div class="field-title">Attached image</div>
     <div class="field-content">
-      <img src="/System/GetUploadedImage?fileName=@ViewBag.image.file" />
+      <img class="field-content-image" src="/System/GetUploadedImage?fileName=@ViewBag.image.file" />
     </div>
   </div>
 }
+<hr>
+<h3>Operations</h3>
+@if (ViewBag.appointment.status == 0) {
+  // Cancel
+  <a class="btn btn-light" href="../Cancel/@ViewBag.appointment.uuid">Cancel</a>
+  if (ViewBag.role == 2) {
+    // Approve
+    <a class="btn btn-light" href="../Approve/@ViewBag.appointment.uuid">Approve</a>
+  }
+} else if (ViewBag.appointment.status == 1 && ViewBag.role == 2) {
+  <a href="../UploadImage/@ViewBag.appointment.uuid" class="btn btn-sm btn-primary">Upload Image</a>
+} else if (ViewBag.appointment.status == 2 && ViewBag.role == 1) {
+  <a href="../Review/@ViewBag.appointment.uuid" class="btn btn-sm btn-primary">Rate your experience</a>
+} else {
+  <i>No operation available</i>
+}
 
 @section Scripts {
   <style>
@@ -74,6 +90,9 @@
       border-radius: 50%;
       margin-right: 10px;
     }
+    .field .field-content img.field-content-image {
+      max-width: 60%;
+    }
 
     .badge {
       border-radius: 0.25rem;
diff --git a/FIT5032-Assignment/Views/Appointments/Index.cshtml b/FIT5032-Assignment/Views/Appointments/Index.cshtml
index 3d9e873..da5087d 100644
--- a/FIT5032-Assignment/Views/Appointments/Index.cshtml
+++ b/FIT5032-Assignment/Views/Appointments/Index.cshtml
@@ -48,6 +48,8 @@
         <td>
           @if (item.Item1.status == 0) {
             <a href='./Cancel/@item.Item1.uuid' class="btn btn-sm btn-danger">Cancel</a>
+          } else if (item.Item1.status == 2) {
+            <a href="./Detail/@item.Item1.uuid" class="btn btn-sm btn-primary">Detail</a>
           }
         </td>
       </tr>