diff --git a/app/Http/Controllers/Admin/Stats/LevelController.php b/app/Http/Controllers/Admin/Stats/LevelController.php
index a53a3e5112..de013f9518 100644
--- a/app/Http/Controllers/Admin/Stats/LevelController.php
+++ b/app/Http/Controllers/Admin/Stats/LevelController.php
@@ -17,15 +17,15 @@ class LevelController extends Controller {
      *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function getLevels($type = 'Character') {
+    public function getLevels(Request $request, $type = 'Character') {
         $levels = Level::ordered($type);
 
-        $page = (int) request('page', 1);
-        $perPage = 20;
+        // $page = (int) request('page', 1);
+        // $perPage = 20;
 
         return view('admin.levels.levels', [
             'type'   => $type,
-            'levels' => $levels->forPage($page, $perPage),
+            'levels' => $levels->paginate(20)->appends($request->query()),
         ]);
     }
 
diff --git a/app/Models/Claymore/Gear.php b/app/Models/Claymore/Gear.php
index 5afa55947d..233cc6af80 100644
--- a/app/Models/Claymore/Gear.php
+++ b/app/Models/Claymore/Gear.php
@@ -235,7 +235,7 @@ public function getImageUrlAttribute() {
      * @return string
      */
     public function getUrlAttribute() {
-        return url('world/gear?name='.$this->name);
+        return url('world/gears?name='.$this->name);
     }
 
     /**
@@ -244,7 +244,7 @@ public function getUrlAttribute() {
      * @return string
      */
     public function getIdUrlAttribute() {
-        return url('world/gear/'.$this->id);
+        return url('world/gears/'.$this->id);
     }
 
     /**
diff --git a/app/Services/Stat/StatService.php b/app/Services/Stat/StatService.php
index cdba2fef6b..4baf528887 100644
--- a/app/Services/Stat/StatService.php
+++ b/app/Services/Stat/StatService.php
@@ -66,7 +66,7 @@ public function updateStat($stat, $data) {
             if (!isset($data['name'])) {
                 throw new \Exception('Please provide a name for the stat.');
             }
-            if (!isset($data['base'])) {
+            if ($stat->id !== config('lorekeeper.claymores_and_companions.stat_points.general_id') && !isset($data['base'])) {
                 throw new \Exception('Please set a base stat value.');
             }
             if (isset($data['colour'])) {
diff --git a/database/migrations/2026_03_07_225854_fix_gear_descriptions.php b/database/migrations/2026_03_07_225854_fix_gear_descriptions.php
new file mode 100644
index 0000000000..44127d7625
--- /dev/null
+++ b/database/migrations/2026_03_07_225854_fix_gear_descriptions.php
@@ -0,0 +1,25 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration {
+    /**
+     * Run the migrations.
+     */
+    public function up(): void {
+        Schema::table('gears', function (Blueprint $table) {
+            $table->text('description')->change();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void {
+        Schema::table('gears', function (Blueprint $table) {
+            $table->string('description')->change();
+        });
+    }
+};
diff --git a/resources/views/admin/claymores/gear/create_edit_gear.blade.php b/resources/views/admin/claymores/gear/create_edit_gear.blade.php
index e4c63aa467..475818afb7 100644
--- a/resources/views/admin/claymores/gear/create_edit_gear.blade.php
+++ b/resources/views/admin/claymores/gear/create_edit_gear.blade.php
@@ -126,6 +126,10 @@
                     'description' => $gear->description,
                     'searchUrl' => $gear->searchUrl,
                     'visible' => $gear->is_visible,
+                    'edit' => [
+                        'title' => 'Edit Gear',
+                        'object' => $gear,
+                    ],
                 ])
             </div>
         </div>
diff --git a/resources/views/admin/claymores/gear/create_edit_gear_category.blade.php b/resources/views/admin/claymores/gear/create_edit_gear_category.blade.php
index 7b74e0ac1b..65ccca51a2 100644
--- a/resources/views/admin/claymores/gear/create_edit_gear_category.blade.php
+++ b/resources/views/admin/claymores/gear/create_edit_gear_category.blade.php
@@ -66,11 +66,13 @@
         <h3>Preview</h3>
         <div class="card mb-3">
             <div class="card-body">
-                @include('world._claymore_entry', [
-                    'item' => null,
+                @include('world._entry', [
+                    'edit' => ['object' => $category, 'title' => 'Gear Category'],
+                    'item' => $category,
                     'imageUrl' => $category->categoryImageUrl,
                     'name' => $category->displayName,
-                    'description' => $category->description,
+                    'description' => $category->parsed_description,
+                    'searchUrl' => $category->searchUrl,
                     'category' => $category,
                     'visible' => $category->is_visible,
                 ])
diff --git a/resources/views/admin/claymores/weapon/create_edit_weapon.blade.php b/resources/views/admin/claymores/weapon/create_edit_weapon.blade.php
index 5679d19384..cf1c46bb9b 100644
--- a/resources/views/admin/claymores/weapon/create_edit_weapon.blade.php
+++ b/resources/views/admin/claymores/weapon/create_edit_weapon.blade.php
@@ -126,6 +126,10 @@
                     'description' => $weapon->description,
                     'searchUrl' => $weapon->searchUrl,
                     'visible' => $weapon->is_visible,
+                    'edit' => [
+                        'title' => 'Edit Weapon',
+                        'object' => $weapon,
+                    ],
                 ])
             </div>
         </div>
diff --git a/resources/views/admin/claymores/weapon/create_edit_weapon_category.blade.php b/resources/views/admin/claymores/weapon/create_edit_weapon_category.blade.php
index 20e3308fa3..c3f38bc5ea 100644
--- a/resources/views/admin/claymores/weapon/create_edit_weapon_category.blade.php
+++ b/resources/views/admin/claymores/weapon/create_edit_weapon_category.blade.php
@@ -66,11 +66,13 @@
         <h3>Preview</h3>
         <div class="card mb-3">
             <div class="card-body">
-                @include('world._claymore_entry', [
-                    'item' => null,
+                @include('world._entry', [
+                    'edit' => ['object' => $category, 'title' => 'Weapon Category'],
+                    'item' => $category,
                     'imageUrl' => $category->categoryImageUrl,
                     'name' => $category->displayName,
-                    'description' => $category->description,
+                    'description' => $category->parsed_description,
+                    'searchUrl' => $category->searchUrl,
                     'category' => $category,
                     'visible' => $category->is_visible,
                 ])
diff --git a/resources/views/admin/elements/create_edit_element.blade.php b/resources/views/admin/elements/create_edit_element.blade.php
index 84441737e6..2af8509151 100644
--- a/resources/views/admin/elements/create_edit_element.blade.php
+++ b/resources/views/admin/elements/create_edit_element.blade.php
@@ -114,6 +114,7 @@
 
 @section('scripts')
     @parent
+    @include('js._tinymce_wysiwyg')
     <script>
         $(document).ready(function() {
             $('.selectize').selectize();
diff --git a/resources/views/admin/levels/levels.blade.php b/resources/views/admin/levels/levels.blade.php
index bb2d3d45ae..2a8c4e0ee4 100644
--- a/resources/views/admin/levels/levels.blade.php
+++ b/resources/views/admin/levels/levels.blade.php
@@ -31,6 +31,7 @@
         {!! Form::close() !!}
     </div>
 
+    {!! $levels->render() !!}
     @if (!count($levels))
         <p>No levels found.</p>
     @else
@@ -68,4 +69,6 @@
             </tbody>
         </table>
     @endif
+    {!! $levels->render() !!}
+
 @endsection
diff --git a/resources/views/admin/skills/create_edit_skill.blade.php b/resources/views/admin/skills/create_edit_skill.blade.php
index 444e0caa40..a0d4c744f7 100644
--- a/resources/views/admin/skills/create_edit_skill.blade.php
+++ b/resources/views/admin/skills/create_edit_skill.blade.php
@@ -137,6 +137,7 @@
 
 @section('scripts')
     @parent
+    @include('js._tinymce_wysiwyg')
     <script>
         $(document).ready(function() {
             $('.selectize').selectize();
diff --git a/resources/views/admin/skills/create_edit_skill_category.blade.php b/resources/views/admin/skills/create_edit_skill_category.blade.php
index 05d1f624ee..154385b0ea 100644
--- a/resources/views/admin/skills/create_edit_skill_category.blade.php
+++ b/resources/views/admin/skills/create_edit_skill_category.blade.php
@@ -66,6 +66,7 @@
 
 @section('scripts')
     @parent
+    @include('js._tinymce_wysiwyg')
     <script>
         $(document).ready(function() {
             $('.delete-category-button').on('click', function(e) {
diff --git a/resources/views/admin/stats/create_edit_stat.blade.php b/resources/views/admin/stats/create_edit_stat.blade.php
index f14af84b82..3272e6fbe6 100644
--- a/resources/views/admin/stats/create_edit_stat.blade.php
+++ b/resources/views/admin/stats/create_edit_stat.blade.php
@@ -74,7 +74,12 @@
         </div>
         <div class="col-md form-group">
             {!! Form::label('Colour') !!} {!! add_help('This is the colour that will be used to display the stat on the character page. Set it to white to disable.') !!}
-            {!! Form::color('colour', $stat->colour, ['class' => 'form-control']) !!}
+            <div class="input-group cp">
+                {!! Form::text('colour', $stat->colour, ['class' => 'form-control']) !!}
+                <span class="input-group-append">
+                    <span class="input-group-text colorpicker-input-addon"><i></i></span>
+                </span>
+            </div>
         </div>
     </div>
 
diff --git a/resources/views/admin/statuses/create_edit_status.blade.php b/resources/views/admin/statuses/create_edit_status.blade.php
index 6ed1a7deb4..010b355541 100644
--- a/resources/views/admin/statuses/create_edit_status.blade.php
+++ b/resources/views/admin/statuses/create_edit_status.blade.php
@@ -98,6 +98,7 @@
 
 @section('scripts')
     @parent
+    @include('js._tinymce_wysiwyg')
     <script>
         $(document).ready(function() {
             $('#add-severity').on('click', function(e) {
diff --git a/resources/views/world/_sidebar.blade.php b/resources/views/world/_sidebar.blade.php
index da225425b2..4e5d732d64 100644
--- a/resources/views/world/_sidebar.blade.php
+++ b/resources/views/world/_sidebar.blade.php
@@ -41,7 +41,7 @@
                 <div class="sidebar-item"><a href="{{ url('world/levels/character') }}" class="{{ set_active('world/levels/character*') }}">Character Levels</a></div>
             @endif
             @if (config('lorekeeper.claymores_and_companions.visibility_settings.character_stats'))
-                <div class="sidebar-item"><a href="{{ url('world/character-stats') }}" class="{{ set_active('world/character-stats*') }}">Character Stats</a></div>
+                <div class="sidebar-item"><a href="{{ url('world/stats') }}" class="{{ set_active('world/stats*') }}">Character Stats</a></div>
             @endif
         </li>
     @endif
@@ -58,7 +58,7 @@
             @endif
             @if (config('lorekeeper.claymores_and_companions.visibility_settings.gear'))
                 <div class="sidebar-item"><a href="{{ url('world/gear-categories') }}" class="{{ set_active('world/gear-categories*') }}">Gear Categories</a></div>
-                <div class="sidebar-item"><a href="{{ url('world/gear') }}" class="{{ set_active('world/gear*') }}">All Gear</a></div>
+                <div class="sidebar-item"><a href="{{ url('world/gears') }}" class="{{ set_active('world/gears*') }}">All Gear</a></div>
             @endif
         </li>
     @endif
diff --git a/resources/views/world/gear_categories.blade.php b/resources/views/world/gear_categories.blade.php
index 37b38a9aa9..232e9fa569 100644
--- a/resources/views/world/gear_categories.blade.php
+++ b/resources/views/world/gear_categories.blade.php
@@ -23,9 +23,9 @@
     @foreach ($categories as $category)
         <div class="card mb-3">
             <div class="card-body">
-                @include('world._claymore_entry', [
+                @include('world._entry', [
                     'edit' => ['object' => $category, 'title' => 'Gear Category'],
-                    'item' => null,
+                    'item' => $category,
                     'imageUrl' => $category->categoryImageUrl,
                     'name' => $category->displayName,
                     'description' => $category->parsed_description,
diff --git a/resources/views/world/weapon_categories.blade.php b/resources/views/world/weapon_categories.blade.php
index d36226047f..7f45cb014a 100644
--- a/resources/views/world/weapon_categories.blade.php
+++ b/resources/views/world/weapon_categories.blade.php
@@ -23,12 +23,13 @@
     @foreach ($categories as $category)
         <div class="card mb-3">
             <div class="card-body">
-                @include('world._claymore_entry', [
+                @include('world._entry', [
                     'edit' => ['object' => $category, 'title' => 'Weapon Category'],
-                    'item' => null,
+                    'item' => $category,
                     'imageUrl' => $category->categoryImageUrl,
                     'name' => $category->displayName,
                     'description' => $category->parsed_description,
+                    'searchUrl' => $category->searchUrl,
                     'category' => $category,
                     'visible' => $category->is_visible,
                 ])
diff --git a/routes/lorekeeper/browse.php b/routes/lorekeeper/browse.php
index d4e13105b3..9cb30eec80 100644
--- a/routes/lorekeeper/browse.php
+++ b/routes/lorekeeper/browse.php
@@ -153,8 +153,8 @@
     Route::get('weapons', 'WorldController@getWeapons');
     Route::get('weapons/{id}', 'WorldController@getWeapon');
     Route::get('gear-categories', 'WorldController@getGearCategories');
-    Route::get('gear', 'WorldController@getGears');
-    Route::get('gear/{id}', 'WorldController@getGear');
+    Route::get('gears', 'WorldController@getGears');
+    Route::get('gears/{id}', 'WorldController@getGear');
     Route::get('character-classes', 'WorldController@getCharacterClasses');
     Route::get('skill-categories', 'WorldController@getSkillCategories');
     Route::get('skills', 'WorldController@getSkills');