diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index 33da1737..a9c1fa47 100644
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -56,7 +56,8 @@ input {
 .h-heroes,
 .c-description,
 .g-type,
-.g-tm {
+.g-tm,
+.rune .c-sub {
   display: none;
 }
 
@@ -402,6 +403,7 @@ main {
   .c-sub {
     flex-wrap: wrap;
     flex-direction: row;
+    cursor: pointer;
   }
 }
 
diff --git a/app/controllers/chars_controller.rb b/app/controllers/chars_controller.rb
index 44695c6f..3c0d2615 100644
--- a/app/controllers/chars_controller.rb
+++ b/app/controllers/chars_controller.rb
@@ -2,14 +2,8 @@ class CharsController < ApplicationController
   before_action :set_char, only: :show
 
   def index
-    @knight = Char.where(role_id: 1).order('name ASC').load_async
-    @warrior = Char.where(role_id: 2).order('name ASC').load_async
-    @assassin = Char.where(role_id: 3).order('name ASC').load_async
-    @archer = Char.where(role_id: 4).order('name ASC').load_async
-    @mechanic = Char.where(role_id: 5).order('name ASC').load_async
-    @wizard = Char.where(role_id: 6).order('name ASC').load_async
-    @priest = Char.where(role_id: 7).order('name ASC').load_async
-    # @chars = Char.order('name ASC').load_async
+    @roles = Role.all.load_async
+    @chars = Char.order('name ASC').load_async
     # @chars = JSON.parse(File.read('./public/json/heroes.json'))
     # render json: @chars
   end
diff --git a/app/controllers/enchants_controller.rb b/app/controllers/enchants_controller.rb
index c728190a..6aea01c4 100644
--- a/app/controllers/enchants_controller.rb
+++ b/app/controllers/enchants_controller.rb
@@ -1,19 +1,5 @@
 class EnchantsController < ApplicationController
-  before_action :set_enchant, only: :show
-
   def index
-    @enchants = Enchant.all
+    @enchants = Enchant.all.load_async
   end
-
-  def show
-  end
-
-  private
-    def set_enchant
-      @enchant = Enchant.find(params[:id])
-    end
-
-    def enchant_params
-      params.require(:enchant).permit(:name, :tier, :type)
-    end
 end
diff --git a/app/controllers/gears_controller.rb b/app/controllers/gears_controller.rb
index a7bc8012..b98fa002 100644
--- a/app/controllers/gears_controller.rb
+++ b/app/controllers/gears_controller.rb
@@ -1,22 +1,8 @@
 class GearsController < ApplicationController
-  before_action :set_gear, only: :show
-
   def index
     @roles = Role.order('id ASC').load_async
     @chars = Char.order('name ASC').load_async
     @gears = Gear.order('id ASC').load_async
     @skills = Skill.where('length(parent_id) > 4').load_async
   end
-
-  def show
-  end
-
-  private
-    def set_gear
-      @gear = Gear.find(params[:id])
-    end
-
-    def gear_params
-      params.require(:gear).permit(:name, :description, :tier, :set, :gear_type, :gear_skill)
-    end
 end
diff --git a/app/controllers/perks_controller.rb b/app/controllers/perks_controller.rb
index cd65bc8a..35b1df64 100644
--- a/app/controllers/perks_controller.rb
+++ b/app/controllers/perks_controller.rb
@@ -1,19 +1,6 @@
 class PerksController < ApplicationController
-  before_action :set_perk, only: :show
-
   def index
+    @roles = Role.all.load_async
     @perks = Perk.all.load_async
   end
-
-  def show
-  end
-
-  private
-    def set_perk
-      @perk = Perk.find(params[:id])
-    end
-
-    def perk_params
-      params.require(:perk).permit(:name, :description, :tier, :sequence, :perk_type)
-    end
 end
diff --git a/app/controllers/roles_controller.rb b/app/controllers/roles_controller.rb
index b638be06..254e638e 100644
--- a/app/controllers/roles_controller.rb
+++ b/app/controllers/roles_controller.rb
@@ -1,20 +1,6 @@
 class RolesController < ApplicationController
-  before_action :set_role, only: :show
-
   def index
     @roles = Role.all.load_async
     @stats = Stat.all.load_async
   end
-
-  def show
-  end
-
-  private
-    def set_role
-      @role = Role.friendly.find(params[:id])
-    end
-
-    def role_params
-      params.require(:role).permit(:name)
-    end
 end
diff --git a/app/controllers/runes_controller.rb b/app/controllers/runes_controller.rb
index 42b2e9f0..98e7a8f4 100644
--- a/app/controllers/runes_controller.rb
+++ b/app/controllers/runes_controller.rb
@@ -1,18 +1,5 @@
 class RunesController < ApplicationController
-  before_action :set_rune, only: :show
   def index
     @runes = Rune.where(tier: ['Legendary', 'Velkazar']).load_async
   end
-
-  def show
-  end
-
-  private
-    def set_rune
-      @rune = Rune.find(params[:id])
-    end
-
-    def rune_params
-      params.require(:rune).permit(:name, :value, :type_gear, :tier)
-    end
 end
diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb
index a16409e1..bf6902d8 100644
--- a/app/controllers/search_controller.rb
+++ b/app/controllers/search_controller.rb
@@ -1,9 +1,23 @@
 class SearchController < ApplicationController
   def search
-    @chars = Char.order('name ASC').ransack(name_cont: params[:q]).result(distinct: true).limit(10).load_async
-    @gears = Gear.order('name ASC').where.not(gear_type: 'acc').ransack(name_or_description_cont: params[:q]).result(distinct: true).limit(10).load_async
-    @perks = Perk.order('name ASC').ransack(name_or_description_cont: params[:q]).result(distinct: true).limit(10).load_async
-    @skills = Skill.order('name ASC').ransack(name_or_description_cont: params[:q]).result(distinct: true).limit(10).load_async
+    @chars = Char.ransack(name_cont: params[:q])
+                 .result(distinct: true)
+                 .order("name ASC")
+                 .limit(10).load_async
+    @gears = Gear.where.not("gear_type = ? AND gear_type = ? AND tier = ?", "acc", "", "")
+                 .ransack(name_or_description_cont: params[:q])
+                 .result(distinct: true)
+                 .order("name ASC")
+                 .limit(10).load_async
+    @perks = Perk.where.not(perk_type: "t5")
+                 .ransack(name_or_description_cont: params[:q])
+                 .result(distinct: true)
+                 .order("name ASC")
+                 .limit(10).load_async
+    @skills = Skill.ransack(name_or_description_cont: params[:q])
+                   .result(distinct: true)
+                   .order("name ASC")
+                   .limit(10).load_async
 
     respond_to do |format|
       format.html {}
diff --git a/app/controllers/skills_controller.rb b/app/controllers/skills_controller.rb
index 7804bc49..88999472 100644
--- a/app/controllers/skills_controller.rb
+++ b/app/controllers/skills_controller.rb
@@ -1,20 +1,6 @@
 class SkillsController < ApplicationController
-  before_action :set_skill, only: :show
-
   def index
     @chars = Char.order('name ASC').load_async
     @skills = Skill.order('skill_number ASC').load_async
   end
-
-  def show
-  end
-
-  private
-    def set_skill
-      @skill = Skill.find(params[:id])
-    end
-
-    def skill_params
-      params.require(:skill).permit(:name, :description, :mana, :cooldown, :skill_number)
-    end
 end
diff --git a/app/controllers/stats_controller.rb b/app/controllers/stats_controller.rb
index d2d4f9f7..3212119c 100644
--- a/app/controllers/stats_controller.rb
+++ b/app/controllers/stats_controller.rb
@@ -1,19 +1,5 @@
 class StatsController < ApplicationController
-  before_action :set_stat, only: :show
-
   def index
     @stats = Stat.all
   end
-
-  def show
-  end
-
-  private
-    def set_stat
-      @stat = Stat.find(params[:id])
-    end
-
-    def stat_params
-      params.require(:stat).permit(:name, :value, :stat_type, :notice)
-    end
 end
diff --git a/app/javascript/packs/sup.js b/app/javascript/packs/sup.js
index c14706c3..3ca16eb1 100644
--- a/app/javascript/packs/sup.js
+++ b/app/javascript/packs/sup.js
@@ -3,6 +3,9 @@
     $('.h-title').click(function () {
       $(this).next('.h-heroes').fadeToggle('fast').css({ 'display': 'flex', 'flex-wrap': 'wrap', 'justify-content': 'center' });
     });
+    $('.rune h4').click(function () {
+      $(this).next('.c-sub').fadeToggle('fast').css({ 'display': 'flex', 'flex-wrap': 'wrap', 'justify-content': 'center' });
+    });
     $('.main h4').click(function () {
       $(this).next('.g-type').fadeToggle('fast').css({ 'display': 'flex', 'flex-wrap': 'wrap', 'justify-content': 'center' });
       $(this).next('.g-tm').fadeToggle('fast').css({ 'display': 'flex' });
@@ -69,10 +72,10 @@
     });
 
     /* hide null stat */
-    $('.c-stat .r-stat, .h-main .r-stat').find('p').each(function () {
-      $zeroStat = $(this).text();
-      if ($zeroStat === '0')
-        $(this).hide().prev('p').hide();
-    });
+    // $('.c-stat .r-stat, .h-main .r-stat').find('p').each(function () {
+    //   $zeroStat = $(this).text();
+    //   if ($zeroStat === '0')
+    //     $(this).hide().prev('p').hide();
+    // });
   });
 }).call(this);
diff --git a/app/views/chars/index.html.slim b/app/views/chars/index.html.slim
index bbc8ee52..1fa40711 100644
--- a/app/views/chars/index.html.slim
+++ b/app/views/chars/index.html.slim
@@ -1,52 +1,11 @@
 title Hero
 
 .main
-  .h-title
-    img src='/images/media/classes/knight.webp' alt='Knight'
-    span Knight
-  .h-heroes
-    - @knight.each do |k|
-      = link_to k, title: k.name do
-        img src='/images/media/heroes/#{k.name.downcase}/portrait.webp' alt=k.name
-  .h-title
-    img src='/images/media/classes/warrior.webp' alt='Warrior'
-    span Warrior
-  .h-heroes
-    - @warrior.each do |w|
-      = link_to w, title: w.name do
-        img src='/images/media/heroes/#{w.name.downcase}/portrait.webp' alt=w.name
-  .h-title
-    img src='/images/media/classes/assassin.webp' alt='Assassin'
-    span Assassin
-  .h-heroes
-    - @assassin.each do |a|
-      = link_to a, title: a.name do
-        img src='/images/media/heroes/#{a.name.downcase}/portrait.webp' alt=a.name
-  .h-title
-    img src='/images/media/classes/archer.webp' alt='Archer'
-    span Archer
-  .h-heroes
-    - @archer.each do |a|
-      = link_to a, title: a.name do
-        img src='/images/media/heroes/#{a.name.downcase}/portrait.webp' alt=a.name
-  .h-title
-    img src='/images/media/classes/mechanic.webp' alt='Mechanic'
-    span Mechanic
-  .h-heroes
-    - @mechanic.each do |m|
-      = link_to m, title: m.name do
-        img src='/images/media/heroes/#{m.name.downcase}/portrait.webp' alt=m.name
-  .h-title
-    img src='/images/media/classes/wizard.webp' alt='Wizard'
-    span Wizard
-  .h-heroes
-    - @wizard.each do |w|
-      = link_to w, title: w.name do
-        img src='/images/media/heroes/#{w.name.downcase}/portrait.webp' alt=w.name
-  .h-title
-    img src='/images/media/classes/priest.webp' alt='Priest'
-    span Priest
-  .h-heroes
-    - @priest.each do |p|
-      = link_to p, title: p.name do
-        img src='/images/media/heroes/#{p.name.downcase}/portrait.webp' alt=p.name
+  - @roles.each do |role|
+    .h-title
+      = image_tag "/images/media/classes/#{role.name.downcase}.webp", alt: role.name
+      span #{role.name}
+    .h-heroes
+      - @chars.where(role_id: role.id).each do |char|
+        = link_to char, title: char.name do
+          = image_tag "/images/media/heroes/#{char.name.downcase}/portrait.webp", alt: char.name
\ No newline at end of file
diff --git a/app/views/home/index.html.slim b/app/views/home/index.html.slim
index 27dbedb1..43d032f2 100644
--- a/app/views/home/index.html.slim
+++ b/app/views/home/index.html.slim
@@ -5,31 +5,39 @@ title King's Raid DB
     p Hero
     - @chars.each do |char|
       = link_to chars_path do
-        img src="/images/media/heroes/#{char.name.downcase}/portrait.webp" title=char.name alt=char.name
+        = image_tag "/images/media/heroes/#{char.name.downcase}/portrait.webp",
+          title: char.name, alt: char.name
   .home-a
     p Gear
     - @gears.each do |gear|
       = link_to gears_path do
-        img src="/images/media/#{gear.gear_type}/#{gear.name}.webp" title=gear.name alt=gear.name
+        = image_tag "/images/media/#{gear.gear_type}/#{gear.name}.webp",
+          title: gear.name, alt: gear.name
   .home-a
     p Perk
     - @perks.each do |perk|
       = link_to perks_path do
-        img src="/images/media/heroes/#{perk.tier.downcase}/#{perk.sequence}.webp" title="#{perk.tier} - #{perk.name}"
+        = image_tag "/images/media/heroes/#{perk.tier.downcase}/#{perk.sequence}.webp",
+          title: "#{perk.tier} - #{(perk.name)}", alt: perk.name
   .home-a
     p Rune
     - @runes.each do |rune|
       = link_to runes_path do
         - if rune.name == "MP Recovery/Attack"
-          img src="/images/media/runes/MPRA.webp" title="#{rune.tier} #{rune.name} #{rune.value}"
+          = image_tag "/images/media/runes/MPRA.webp",
+            title: "#{rune.tier} #{rune.name} #{rune.value}", alt: rune.name
         - elsif rune.name == "MP Recovery/DMG"
-          img src="/images/media/runes/MPRD.webp" title="#{rune.tier} #{rune.name} #{rune.value}"
+          = image_tag "/images/media/runes/MPRD.webp",
+            title: "#{rune.tier} #{rune.name} #{rune.value}", alt: rune.name
         - elsif rune.tier == "Velkazar"
-          img src="/images/media/runes/Velkazar/#{rune.id}.webp" title="#{rune.name} #{rune.value}"
+          = image_tag "/images/media/runes/Velkazar/#{rune.id}.webp",
+            title: "#{rune.name} #{rune.value}", alt: rune.name
         - else
-          img src="/images/media/runes/#{rune.name}.webp" title="#{rune.tier} #{rune.name} #{rune.value}"
+          = image_tag "/images/media/runes/#{rune.name}.webp",
+            title: "#{rune.tier} #{rune.name} #{rune.value}", alt: rune.name
   .home-a
     p Skill
     - @skills.each do |skill|
       = link_to skills_path do
-        img src="/images/media/heroes/#{skill.char.name.downcase}/s#{skill.skill_number}.webp" title="#{skill.char.name} - #{skill.name}"
+        = image_tag "/images/media/heroes/#{skill.char.name.downcase}/s#{skill.skill_number}.webp",
+          title: "#{skill.char.name} - #{skill.name}", alt: skill.name
diff --git a/app/views/perks/index.html.slim b/app/views/perks/index.html.slim
index 628b3413..6336bb13 100644
--- a/app/views/perks/index.html.slim
+++ b/app/views/perks/index.html.slim
@@ -3,88 +3,23 @@ title Perk
 .main.perk
   h4 T1 Generic
   .c-sub
-    - @perks.where(tier: 'Generic').each do |perk|
+    - @perks.where(tier: "Generic").each do |perk|
       .c-img
-        img src='/images/media/genericPerks/#{perk.name}.webp' title=perk.description
-        .c-description
-          .p1 #{perk.name}
-          .p4
-            hr
-            p #{perk.description}
-
-  h4 T2 Knight
-  .c-sub
-    - @perks.where(tier: 'Knight').each do |perk|
-      .c-img
-        img src='/images/media/genericPerks/#{perk.name}.webp' title=perk.description
-        .c-description
-          .p1 #{perk.name}
-          .p4
-            hr
-            p #{perk.description}
-
-  h4 T2 Warrior
-  .c-sub
-    - @perks.where(tier: 'Warrior').each do |perk|
-      .c-img
-        img src='/images/media/genericPerks/#{perk.name}.webp' title=perk.description
-        .c-description
-          .p1 #{perk.name}
-          .p4
-            hr
-            p #{perk.description}
-
-  h4 T2 Assassin
-  .c-sub
-    - @perks.where(tier: 'Assassin').each do |perk|
-      .c-img
-        img src='/images/media/genericPerks/#{perk.name}.webp' title=perk.description
-        .c-description
-          .p1 #{perk.name}
-          .p4
-            hr
-            p #{perk.description}
-
-  h4 T2 Archer
-  .c-sub
-    - @perks.where(tier: 'Archer').each do |perk|
-      .c-img
-        img src='/images/media/genericPerks/#{perk.name}.webp' title=perk.description
-        .c-description
-          .p1 #{perk.name}
-          .p4
-            hr
-            p #{perk.description}
-
-  h4 T2 Mechanic
-  .c-sub
-    - @perks.where(tier: 'Mechanic').each do |perk|
-      .c-img
-        img src='/images/media/genericPerks/#{perk.name}.webp' title=perk.description
-        .c-description
-          .p1 #{perk.name}
-          .p4
-            hr
-            p #{perk.description}
-
-  h4 T2 Wizard
-  .c-sub
-    - @perks.where(tier: 'Wizard').each do |perk|
-      .c-img
-        img src='/images/media/genericPerks/#{perk.name}.webp' title=perk.description
-        .c-description
-          .p1 #{perk.name}
-          .p4
-            hr
-            p #{perk.description}
-
-  h4 T2 Priest
-  .c-sub
-    - @perks.where(tier: 'Priest').each do |perk|
-      .c-img
-        img src='/images/media/genericPerks/#{perk.name}.webp' title=perk.description
+        = image_tag "/images/media/genericPerks/#{perk.name}.webp", title: perk.description
         .c-description
           .p1 #{perk.name}
           .p4
             hr
             p #{perk.description}
+  
+  - @roles.each do |role|
+    h4 T2 #{role.name}
+    .c-sub
+      - @perks.where(tier: role.name).each do |perk|
+        .c-img
+          = image_tag "/images/media/genericPerks/#{perk.name}.webp", title: perk.description
+          .c-description
+            .p1 #{perk.name}
+            .p4
+              hr
+              p #{perk.description}
\ No newline at end of file
diff --git a/app/views/roles/index.html.slim b/app/views/roles/index.html.slim
index 9a7f70aa..787b7f10 100644
--- a/app/views/roles/index.html.slim
+++ b/app/views/roles/index.html.slim
@@ -1,5 +1,7 @@
 title Class
 
+.main
+  h4 Class Stats
 .role
   - @roles.each do |role|
     .c-sub.c-bl3
@@ -7,7 +9,7 @@ title Class
         p.c-stat
           span#s-name Class
           span#s-val
-            img src='/images/media/classes/#{role.name}.webp' alt=role.name
+            img src='/images/media/classes/#{role.name.downcase}.webp' alt=role.name
             span #{role.name}
       .c-stats#statBase
         p
@@ -19,6 +21,7 @@ title Class
         p
         - @stats.where(role_id: role.id, stat_type: 'class').each do |stat|
           p.c-stat
-            span#s-name #{stat.name}
-            span#s-val #{stat.value}
-            span#s-per
+            - if stat.value != 0
+              span#s-name #{stat.name}
+              span#s-val #{stat.value}
+              span#s-per
diff --git a/app/views/runes/index.html.slim b/app/views/runes/index.html.slim
index 82f0eb4b..8d5af704 100644
--- a/app/views/runes/index.html.slim
+++ b/app/views/runes/index.html.slim
@@ -6,11 +6,11 @@ title Runes
     - @runes.where(tier: 'Legendary').each do |rune|
       .c-img
         - if rune.name == 'MP Recovery/Attack'
-          img src='/images/media/runes/MPRA.webp' alt=rune.name
+          = image_tag "/images/media/runes/MPRA.webp", alt: rune.name
         - elsif rune.name == 'MP Recovery/DMG'
-          img src='/images/media/runes/MPRD.webp' alt=rune.name
+          = image_tag "/images/media/runes/MPRD.webp", alt: rune.name
         - else
-          img src='/images/media/runes/#{rune.name}.webp' alt=rune.name
+          = image_tag "/images/media/runes/#{rune.name}.webp", alt: rune.name
         .c-description
           .p1 #{rune.name}
           .p4
@@ -22,7 +22,7 @@ title Runes
   .c-sub
     - @runes.where(tier: 'Velkazar').each do |rune|
       .c-img
-        img src='/images/media/runes/Velkazar/#{rune.id}.webp' alt=rune.name
+        = image_tag "/images/media/runes/Velkazar/#{rune.id}.webp", alt: rune.name
         .c-description
           .p1 #{rune.name}
           .p4
diff --git a/app/views/search/search.html.slim b/app/views/search/search.html.slim
index 1cad96a4..8847aa37 100644
--- a/app/views/search/search.html.slim
+++ b/app/views/search/search.html.slim
@@ -1,3 +1,6 @@
+- c = "/images/media/heroes"
+- g = "/images/media/gears"
+- s = "/images/media/skills"
 title Search
 
 .search-main
@@ -6,101 +9,101 @@ title Search
     - @chars.each do |char|
       .search-block
         = link_to char, title: char.name do
-          img src='/images/media/heroes/#{char.name.downcase}/portrait.webp' alt=''
+          = image_tag "#{c}/#{char.name.downcase}/portrait.webp", alt: char.name
         span #{char.name}
   .search-sub
     h1 Gears
-    - @gears.where.not(tier: '', gear_type: '').each do |gear|
+    - @gears.each do |gear|
       .search-block
         p#help-description
-          img src='/images/help.svg' id='g#{gear.id.to_s}' alt=''
-        - if !gear.char_id.blank? && gear.gear_type == '10-UW'
+          = image_tag "/images/help.svg", id: "g#{gear.id.to_s}", alt: ""
+        - if !gear.char_id.blank? && gear.gear_type == "10-UW"
           = link_to gear.char, title: gear.char.name do
-            img src='/images/media/heroes/#{gear.char.name.downcase}/uw.webp' alt=''
-        - elsif gear.char_id.blank? && gear.gear_type == '10-UW'
-          = link_to '/gears', title: gear.name do
-            img src='/images/media/heroes/#{gear.role.name.downcase}.webp' alt=''
-        - elsif !gear.char_id.blank? && gear.gear_type == '9-UT'
+            = image_tag "#{c}/#{gear.char.name.downcase}/uw.webp", alt: ""
+        - elsif gear.char_id.blank? && gear.gear_type == "10-UW"
+          = link_to "/gears", title: gear.name do
+            = image_tag "#{c}/#{gear.role.name.downcase}.webp", alt: ""
+        - elsif !gear.char_id.blank? && gear.gear_type == "9-UT"
           = link_to gear.char, title: gear.char.name do
-            img src='/images/media/heroes/#{gear.char.name.downcase}/ut#{gear.gear_skill}.webp' alt=''
-        - elsif gear.char_id.blank? && gear.gear_type == '9-UT'
-          = link_to '/gears', title: gear.name do
-            img src='/images/media/gears/#{gear.gear_type}/mana.webp' alt=''
-        - elsif gear.gear_type == 'art'
-          = link_to '/gears', title: gear.name do
-            img src='/images/media/#{gear.gear_type}/#{gear.name}.webp' alt=''
+            = image_tag "#{c}/#{gear.char.name.downcase}/ut#{gear.gear_skill}.webp", alt: ""
+        - elsif gear.char_id.blank? && gear.gear_type == "9-UT"
+          = link_to "/gears", title: gear.name do
+            = image_tag "#{g}/#{gear.gear_type}/mana.webp", alt: ""
+        - elsif gear.gear_type == "art"
+          = link_to "/gears", title: gear.name do
+            = image_tag "/images/media/#{gear.gear_type}/#{gear.name}.webp", alt: ""
 
-        - elsif gear.set != 'Legendary' && gear.set != 'Technomagic' && gear.tier != 'TM'
-          - if gear.gear_type == '7-J'
-            = link_to '/gears', title: gear.name do
-              img src='/images/media/gears/#{gear.gear_type}/#{gear.name}/#{gear.set}.webp' alt=''
+        - elsif gear.set != "Legendary" && gear.set != "Technomagic" && gear.tier != "TM"
+          - if gear.gear_type == "7-J"
+            = link_to "/gears", title: gear.name do
+              = image_tag "#{g}/#{gear.gear_type}/#{gear.name}/#{gear.set}.webp", alt: ""
           - else
-            = link_to '/gears', title: gear.name do
-              img src='/images/media/gears/#{gear.gear_type}/#{gear.set}.webp' alt=''
+            = link_to "/gears", title: gear.name do
+              = image_tag "#{g}/#{gear.gear_type}/#{gear.set}.webp", alt: ""
 
-        - elsif gear.set == 'Legendary'
+        - elsif gear.set == "Legendary"
           - if gear.name == "Hell's Eyes"
-            = link_to '/gears', title: gear.name do
-              img src='/images/media/gears/#{gear.gear_type}/Ring/#{gear.set}.webp' alt=''
+            = link_to "/gears", title: gear.name do
+              = image_tag "#{g}/#{gear.gear_type}/Ring/#{gear.set}.webp", alt: ""
           - elsif gear.name == "Fire Dragon's Blessing"
-            = link_to '/gears', title: gear.name do
-              img src='/images/media/gears/#{gear.gear_type}/Earrings/#{gear.set}.webp' alt=''
-          - elsif gear.name == 'Price of Arrogance'
-            = link_to '/gears', title: gear.name do
-              img src='/images/media/gears/#{gear.gear_type}/Necklace/#{gear.set}.webp' alt=''
-          - elsif gear.name == 'Fire Circle'
-            = link_to '/gears', title: gear.name do
-              img src='/images/media/gears/#{gear.gear_type}/Bracelet/#{gear.set}.webp' alt=''
+            = link_to "/gears", title: gear.name do
+              = image_tag "#{g}/#{gear.gear_type}/Earrings/#{gear.set}.webp", alt: ""
+          - elsif gear.name == "Price of Arrogance"
+            = link_to "/gears", title: gear.name do
+              = image_tag "#{g}/#{gear.gear_type}/Necklace/#{gear.set}.webp", alt: ""
+          - elsif gear.name == "Fire Circle"
+            = link_to "/gears", title: gear.name do
+              = image_tag "#{g}/#{gear.gear_type}/Bracelet/#{gear.set}.webp", alt: ""
           - else
-            = link_to '/gears', title: gear.name do
-              img src='/images/media/gears/#{gear.gear_type}/#{gear.set}.webp' alt=''
+            = link_to "/gears", title: gear.name do
+              = image_tag "#{g}/#{gear.gear_type}/#{gear.set}.webp", alt: ""
 
-        - elsif gear.set == 'Technomagic'
-          - if gear.gear_type == '7-J'
-            - if gear.name == 'Ring of Amplification'
-              = link_to '/gears', title: gear.name do
-                img src='/images/media/gears/#{gear.gear_type}/Ring/#{gear.set}.webp' alt=''
-            - elsif gear.name == 'Earrings of Amplification'
-              = link_to '/gears', title: gear.name do
-                img src='/images/media/gears/#{gear.gear_type}/Earrings/#{gear.set}.webp' alt=''
+        - elsif gear.set == "Technomagic"
+          - if gear.gear_type == "7-J"
+            - if gear.name == "Ring of Amplification"
+              = link_to "/gears", title: gear.name do
+                = image_tag "#{g}/#{gear.gear_type}/Ring/#{gear.set}.webp", alt: ""
+            - elsif gear.name == "Earrings of Amplification"
+              = link_to "/gears", title: gear.name do
+                = image_tag "#{g}/#{gear.gear_type}/Earrings/#{gear.set}.webp", alt: ""
           - else
-            = link_to '/gears', title: gear.name do
-              img src='/images/media/gears/#{gear.gear_type}/#{gear.set}.webp' alt=''
+            = link_to "/gears", title: gear.name do
+              = image_tag "#{g}/#{gear.gear_type}/#{gear.set}.webp", alt: ""
 
-        - elsif gear.tier == 'TM'
-          = link_to '/gears', title: gear.name do
-            - if gear.gear_type == '7-J'
-              - if gear.explanation == 'Reclaimed'
-                img src='/images/media/gears/#{gear.gear_type}/#{gear.gear_skill}/#{gear.explanation} #{gear.set} #{gear.name}.webp' alt=''
+        - elsif gear.tier == "TM"
+          = link_to "/gears", title: gear.name do
+            - if gear.gear_type == "7-J"
+              - if gear.explanation == "Reclaimed"
+                = image_tag "#{g}/#{gear.gear_type}/#{gear.gear_skill}/#{gear.explanation} #{gear.set} #{gear.name}.webp", alt: ""
               - else
-                img src='/images/media/gears/#{gear.gear_type}/#{gear.gear_skill}/#{gear.set} #{gear.name}.webp' alt=''
+                = image_tag "#{g}/#{gear.gear_type}/#{gear.gear_skill}/#{gear.set} #{gear.name}.webp", alt: ""
             - else
-              - if gear.explanation == 'Reclaimed'
-                img src='/images/media/gears/#{gear.gear_type}/#{gear.explanation} #{gear.set} #{gear.name}.webp' alt=''
+              - if gear.explanation == "Reclaimed"
+                = image_tag "#{g}/#{gear.gear_type}/#{gear.explanation} #{gear.set} #{gear.name}.webp", alt: ""
               - else
-                img src='/images/media/gears/#{gear.gear_type}/#{gear.set} #{gear.name}.webp' alt=''
+                = image_tag "#{g}/#{gear.gear_type}/#{gear.set} #{gear.name}.webp", alt: ""
 
-        p #{gear.name}
+        - if gear.tier == "TM"
+          p #{gear.explanation} #{gear.name} of #{gear.set} #{gear.gear_skill}
+        - else
+          p #{gear.name}
       .description
-        p id='g#{gear.id}' #{gear.description}
+        p id="g#{gear.id}" #{gear.description}
   .search-sub
     h1 Perks
     - @perks.each do |perk|
       .search-block
         p#help-description
-          img src='/images/help.svg' id='p#{perk.id.to_s}' alt=''
-        - if perk.perk_type == 'generic'
-          = link_to '/perks', title: perk.tier do
-            img src='/images/media/genericPerks/#{perk.name}.webp' alt=''
-        - else
-          = link_to '/chars/' + perk.char.slug, title: perk.tier do
-            img src='/images/media/heroes/#{perk.tier.downcase}/#{perk.sequence}.webp' alt=''
-        - if perk.perk_type == 't5'
-          span #{perk.tier} [#{perk.name.capitalize}]
+          = image_tag "/images/help.svg", id: "p#{perk.id.to_s}", alt: ""
+        - if perk.perk_type == "generic"
+          = link_to "/perks", title: perk.tier do
+            = image_tag "/images/media/genericPerks/#{perk.name}.webp", alt: ""
         - else
-          span #{perk.name}
+          = link_to "/chars/" + perk.char.slug, title: perk.tier do
+            = image_tag "#{c}/#{perk.tier.downcase}/#{perk.sequence}.webp", alt: ""
+        span #{perk.name}
       .description
-        p id='p#{perk.id}'
+        p id="p#{perk.id}"
           span #{perk.tier}
           br
           span #{perk.description}
@@ -109,15 +112,15 @@ title Search
     - @skills.each do |skill|
       .search-block
         p#help-description
-          img src='/images/help.svg' id='s#{skill.id.to_s}' alt=''
+          = image_tag "/images/help.svg", id: "s#{skill.id.to_s}", alt: ""
         = link_to skill.char, title: skill.char.name do
-          - if (skill.parent_id.include? 'Advancement Phase')
-            img src='/images/media/heroes/#{skill.char.name.downcase}/sw.webp' alt=''
+          - if (skill.parent_id.include? "Advancement Phase")
+            = image_tag "#{c}/#{skill.char.name.downcase}/sw.webp", alt: ""
           - else
-            img src='/images/media/heroes/#{skill.char.name.downcase}/s#{skill.skill_number}.webp' alt=''
+            = image_tag "#{c}/#{skill.char.name.downcase}/s#{skill.skill_number}.webp", alt: ""
         span #{skill.name}
       .description
-        p id='s#{skill.id}'
+        p id="s#{skill.id}"
           span #{skill.char.name}
           br
           span #{skill.description}
diff --git a/config/routes.rb b/config/routes.rb
index 9dee2eb4..01024889 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -3,13 +3,13 @@
 
   resources :calcs, only: :index
   resources :chars, only: %i[ index show ]
-  resources :roles, only: %i[ index show ]
-  resources :perks, only: %i[ index show ]
-  resources :stats, only: %i[ index show ]
-  resources :skills, only: %i[ index show ]
-  resources :gears, only: %i[ index show ]
-  resources :enchants, only: %i[ index show ]
-  resources :runes, only: %i[ index show ]
+  resources :roles, only: :index
+  resources :perks, only: :index
+  resources :stats, only: :index
+  resources :skills, only: :index
+  resources :gears, only: :index
+  resources :enchants, only: :index
+  resources :runes, only: :index
 
   get :search, controller: :search
   get 'offline', to: 'home#offline', as: :offline
diff --git a/package.json b/package.json
index 262e8154..71bdee83 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,9 @@
   "name": "kr_calc",
   "private": true,
   "scripts": {
-    "build": "bun bun.config.js",
+    "dev": "bun bun.config.js && rails tailwindcss:build && rails s",
+    "build:assets": "bun bun.config.js && rails tailwindcss:build",
+    "build": "bun.config.js",
     "watch": "rails tailwindcss:watch",
     "check": "bundle outdated",
     "clean": "bundle clean --force"