diff --git a/app/Http/Controllers/CategoryController.php b/app/Http/Controllers/CategoryController.php
index b891b82..f4acd78 100644
--- a/app/Http/Controllers/CategoryController.php
+++ b/app/Http/Controllers/CategoryController.php
@@ -43,13 +43,20 @@ public function show(Category $category)
         return View::make('categories.show', ['category' => $category]);
     }
 
+    public function edit(Category $category)
+    {
+        $this->authorize('update', $category);
+
+        return View::make('categories.edit', ['category' => $category]);
+    }
+
     public function update(CategoryRequest $request, Category $category)
     {
         $this->authorize('update', $category);
 
         $category->update($request->validated());
 
-        return $category;
+        return Redirect::route('categories.index');
     }
 
     public function destroy(Category $category)
diff --git a/resources/views/categories/create.blade.php b/resources/views/categories/create.blade.php
index fdb801f..8c133cd 100644
--- a/resources/views/categories/create.blade.php
+++ b/resources/views/categories/create.blade.php
@@ -5,7 +5,7 @@
 
       <div class="field-row">
         <label for="name">Category Name</label>
-        <input type="text" id="name" name="name" />
+        <input type="text" id="name" name="name" value="{{ old('name') }}" />
         <x-input-error :messages="$errors->get('name')" />
       </div>
 
diff --git a/resources/views/categories/edit.blade.php b/resources/views/categories/edit.blade.php
new file mode 100644
index 0000000..3fb3700
--- /dev/null
+++ b/resources/views/categories/edit.blade.php
@@ -0,0 +1,24 @@
+<x-layout :title="'Edit Category: '.$category->name">
+  <x-window>
+    <form
+      action="{{ route('categories.update', $category->id) }}"
+      method="POST"
+    >
+      @csrf
+      @method('PATCH')
+
+      <div class="field-row">
+        <label for="name">Category Name</label>
+        <input
+          type="text"
+          id="name"
+          name="name"
+          value="{{ old('name', $category->name) }}"
+        />
+        <x-input-error :messages="$errors->get('name')" />
+      </div>
+
+      <button type="submit">Submit</button>
+    </form>
+  </x-window>
+</x-layout>
diff --git a/resources/views/categories/index.blade.php b/resources/views/categories/index.blade.php
index fe997fc..7c1262b 100644
--- a/resources/views/categories/index.blade.php
+++ b/resources/views/categories/index.blade.php
@@ -23,6 +23,22 @@
                 <a href="{{ route('categories.show', $category->id) }}">
                   View
                 </a>
+
+                @auth
+                  <a
+                    href="{{ route('categories.edit', $category->id) }}"
+                    class="ml-1"
+                  >
+                    Edit
+                  </a>
+
+                  <a
+                    href="{{ route('categories.destroy', $category->id) }}"
+                    class="ml-1"
+                  >
+                    Delete
+                  </a>
+                @endauth
               </td>
             </tr>
           @endforeach
@@ -30,6 +46,8 @@
       </table>
     </div>
 
-    <a href="{{ route('categories.create') }}" class="button">New</a>
+    @auth
+      <a href="{{ route('categories.create') }}" class="button">New</a>
+    @endauth
   </x-window>
 </x-layout>