diff --git a/assets/img/druid_icon.png b/assets/img/druid_icon.png
new file mode 100644
index 0000000000..f356622d60
Binary files /dev/null and b/assets/img/druid_icon.png differ
diff --git a/assets/img/paladin_icon.png b/assets/img/paladin_icon.png
new file mode 100644
index 0000000000..cb9ff66416
Binary files /dev/null and b/assets/img/paladin_icon.png differ
diff --git a/assets/img/priest_icon.png b/assets/img/priest_icon.png
new file mode 100644
index 0000000000..05f4b664fe
Binary files /dev/null and b/assets/img/priest_icon.png differ
diff --git a/assets/img/shaman_icon.png b/assets/img/shaman_icon.png
new file mode 100644
index 0000000000..aea02bb6a1
Binary files /dev/null and b/assets/img/shaman_icon.png differ
diff --git a/package-lock.json b/package-lock.json
index 93dfd5fdbc..cc5aa15e5f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -191,6 +191,11 @@
                 "fastq": "^1.6.0"
             }
         },
+        "@popperjs/core": {
+            "version": "2.11.6",
+            "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.6.tgz",
+            "integrity": "sha512-50/17A98tWUfQ176raKiOGXuYpLyyVMkxxG6oylzL3BPOlA6ADGdK7EYunSa4I064xerltq9TGXs8HmOk5E+vw=="
+        },
         "@protobuf-ts/plugin": {
             "version": "2.0.4",
             "resolved": "https://registry.npmjs.org/@protobuf-ts/plugin/-/plugin-2.0.4.tgz",
@@ -251,6 +256,15 @@
                 "@protobuf-ts/runtime": "^2.0.4"
             }
         },
+        "@types/bootstrap": {
+            "version": "5.2.3",
+            "resolved": "https://registry.npmjs.org/@types/bootstrap/-/bootstrap-5.2.3.tgz",
+            "integrity": "sha512-r2SE9NYaaI7B/jJk8gqRtXzlhgFL6dlXBResJkCbQa8ept619WeiOIO4zBQxdmUFzkKNWLK5ZOyYGI3QZoaqbQ==",
+            "dev": true,
+            "requires": {
+                "@popperjs/core": "^2.9.2"
+            }
+        },
         "@types/json-schema": {
             "version": "7.0.11",
             "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.11.tgz",
@@ -571,6 +585,11 @@
             "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
             "dev": true
         },
+        "bootstrap": {
+            "version": "5.2.3",
+            "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.2.3.tgz",
+            "integrity": "sha512-cEKPM+fwb3cT8NzQZYEu4HilJ3anCrWqh3CHAok1p9jXqMPsPTBhU25fBckEJHJ/p+tTxTFTsFQGM+gaHpi3QQ=="
+        },
         "brace-expansion": {
             "version": "2.0.1",
             "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
@@ -2126,4 +2145,4 @@
             "dev": true
         }
     }
-}
\ No newline at end of file
+}
diff --git a/package.json b/package.json
index e733b0f026..ae054465f7 100644
--- a/package.json
+++ b/package.json
@@ -5,6 +5,7 @@
     "devDependencies": {
         "@protobuf-ts/plugin": "^2.0.4",
         "@protobuf-ts/runtime": "^2.0.4",
+        "@types/bootstrap": "^5.2.3",
         "@types/node": "^18.6.1",
         "@typescript-eslint/eslint-plugin": "^5.31.0",
         "@typescript-eslint/parser": "^5.31.0",
@@ -21,5 +22,9 @@
     "scripts": {
         "build": "bazel build //...",
         "test": "bazel test //..."
+    },
+    "dependencies": {
+        "@popperjs/core": "^2.11.6",
+        "bootstrap": "5.2.3"
     }
 }
diff --git a/sim/warrior/dps/TestArms.results b/sim/warrior/dps/TestArms.results
index e07cadebdb..5576e9c0ad 100644
--- a/sim/warrior/dps/TestArms.results
+++ b/sim/warrior/dps/TestArms.results
@@ -1,7 +1,7 @@
 character_stats_results: {
  key: "TestArms-CharacterStats-Default"
  value: {
-  final_stats: 1244.672
+  final_stats: 1233.232
   final_stats: 1001
   final_stats: 1889.25
   final_stats: 176
@@ -12,7 +12,7 @@ character_stats_results: {
   final_stats: 1145.55
   final_stats: 243
   final_stats: 0
-  final_stats: 6760.10757
+  final_stats: 6323.53957
   final_stats: 141
   final_stats: 2256.75564
   final_stats: 243
@@ -25,7 +25,7 @@ character_stats_results: {
   final_stats: 2945.8
   final_stats: 0
   final_stats: 0
-  final_stats: 622.336
+  final_stats: 616.616
   final_stats: 534.48245
   final_stats: 0
   final_stats: 0
@@ -45,658 +45,658 @@ character_stats_results: {
 dps_results: {
  key: "TestArms-AllItems-AshtongueTalismanofValor-32485"
  value: {
-  dps: 7902.2388
-  tps: 6466.11519
+  dps: 7566.97541
+  tps: 6190.98521
  }
 }
 dps_results: {
  key: "TestArms-AllItems-AustereEarthsiegeDiamond"
  value: {
-  dps: 8190.15071
-  tps: 6699.49455
+  dps: 7835.4646
+  tps: 6416.41533
  }
 }
 dps_results: {
  key: "TestArms-AllItems-Bandit'sInsignia-40371"
  value: {
-  dps: 8046.10615
-  tps: 6573.26337
+  dps: 7746.62776
+  tps: 6339.6743
  }
 }
 dps_results: {
  key: "TestArms-AllItems-BeamingEarthsiegeDiamond"
  value: {
-  dps: 8204.61839
-  tps: 6711.7748
+  dps: 7862.45379
+  tps: 6438.8813
  }
 }
 dps_results: {
  key: "TestArms-AllItems-Beast-tamer'sShoulders-30892"
  value: {
-  dps: 7981.25563
-  tps: 6527.9753
+  dps: 7669.18892
+  tps: 6276.73699
  }
 }
 dps_results: {
  key: "TestArms-AllItems-BlessedBattlegearofUndeadSlaying"
  value: {
-  dps: 6864.72838
-  tps: 5599.79337
+  dps: 6626.98777
+  tps: 5411.66434
  }
 }
 dps_results: {
  key: "TestArms-AllItems-BlessedGarboftheUndeadSlayer"
  value: {
-  dps: 6873.79652
-  tps: 5607.04903
+  dps: 6463.17825
+  tps: 5283.98617
  }
 }
 dps_results: {
  key: "TestArms-AllItems-BlessedRegaliaofUndeadCleansing"
  value: {
-  dps: 6541.81066
-  tps: 5345.48752
+  dps: 6261.20619
+  tps: 5119.55528
  }
 }
 dps_results: {
  key: "TestArms-AllItems-BracingEarthsiegeDiamond"
  value: {
-  dps: 8178.09963
-  tps: 6555.51644
+  dps: 7828.71605
+  tps: 6282.76473
  }
 }
 dps_results: {
  key: "TestArms-AllItems-ChaoticSkyflareDiamond"
  value: {
-  dps: 8365.95708
-  tps: 6841.64596
+  dps: 8027.47509
+  tps: 6568.08837
  }
 }
 dps_results: {
  key: "TestArms-AllItems-DarkmoonCard:Berserker!-42989"
  value: {
-  dps: 8001.36321
-  tps: 6548.05753
+  dps: 7663.44856
+  tps: 6271.89406
  }
 }
 dps_results: {
  key: "TestArms-AllItems-DarkmoonCard:Death-42990"
  value: {
-  dps: 8027.0803
-  tps: 6566.18985
+  dps: 7679.42115
+  tps: 6285.01532
  }
 }
 dps_results: {
  key: "TestArms-AllItems-DarkmoonCard:Greatness-44253"
  value: {
-  dps: 7962.99811
-  tps: 6514.57826
+  dps: 7632.70867
+  tps: 6248.04602
  }
 }
 dps_results: {
  key: "TestArms-AllItems-DarkmoonCard:Greatness-44254"
  value: {
-  dps: 7839.61895
-  tps: 6411.13873
+  dps: 7534.99709
+  tps: 6171.22115
  }
 }
 dps_results: {
  key: "TestArms-AllItems-DeathKnight'sAnguish-38212"
  value: {
-  dps: 7916.92275
-  tps: 6476.76166
+  dps: 7623.13464
+  tps: 6240.03089
  }
 }
 dps_results: {
  key: "TestArms-AllItems-Defender'sCode-40257"
  value: {
-  dps: 7841.98604
-  tps: 6412.08128
+  dps: 7558.67769
+  tps: 6188.82549
  }
 }
 dps_results: {
  key: "TestArms-AllItems-DestructiveSkyflareDiamond"
  value: {
-  dps: 8207.87241
-  tps: 6715.16459
+  dps: 7861.36482
+  tps: 6436.0626
  }
 }
 dps_results: {
  key: "TestArms-AllItems-DreadnaughtBattlegear"
  value: {
-  dps: 7611.87744
-  tps: 6231.01044
+  dps: 7299.30889
+  tps: 5981.31473
  }
 }
 dps_results: {
  key: "TestArms-AllItems-DreadnaughtPlate"
  value: {
-  dps: 6804.20552
-  tps: 5542.80912
+  dps: 6514.0051
+  tps: 5309.56636
  }
 }
 dps_results: {
  key: "TestArms-AllItems-EffulgentSkyflareDiamond"
  value: {
-  dps: 8178.09963
-  tps: 6689.19606
+  dps: 7828.71605
+  tps: 6410.87658
  }
 }
 dps_results: {
  key: "TestArms-AllItems-EmberSkyflareDiamond"
  value: {
-  dps: 8178.09963
-  tps: 6689.19606
+  dps: 7828.71605
+  tps: 6410.87658
  }
 }
 dps_results: {
  key: "TestArms-AllItems-EnigmaticSkyflareDiamond"
  value: {
-  dps: 8204.61839
-  tps: 6711.7748
+  dps: 7862.45379
+  tps: 6438.8813
  }
 }
 dps_results: {
  key: "TestArms-AllItems-EnigmaticStarflareDiamond"
  value: {
-  dps: 8201.78077
-  tps: 6709.50554
+  dps: 7859.76475
+  tps: 6436.7282
  }
 }
 dps_results: {
  key: "TestArms-AllItems-EternalEarthsiegeDiamond"
  value: {
-  dps: 8178.09963
-  tps: 6689.19606
+  dps: 7828.71605
+  tps: 6410.87658
  }
 }
 dps_results: {
  key: "TestArms-AllItems-ExtractofNecromanticPower-40373"
  value: {
-  dps: 8021.21156
-  tps: 6562.69634
+  dps: 7667.20134
+  tps: 6274.30197
  }
 }
 dps_results: {
  key: "TestArms-AllItems-EyeoftheBroodmother-45308"
  value: {
-  dps: 7981.63041
-  tps: 6530.60524
+  dps: 7621.97195
+  tps: 6237.82382
  }
 }
 dps_results: {
  key: "TestArms-AllItems-ForgeEmber-37660"
  value: {
-  dps: 7957.25245
-  tps: 6509.97505
+  dps: 7604.80854
+  tps: 6225.5436
  }
 }
 dps_results: {
  key: "TestArms-AllItems-ForlornSkyflareDiamond"
  value: {
-  dps: 8178.09963
-  tps: 6689.19606
+  dps: 7828.71605
+  tps: 6410.87658
  }
 }
 dps_results: {
  key: "TestArms-AllItems-ForlornStarflareDiamond"
  value: {
-  dps: 8178.09963
-  tps: 6689.19606
+  dps: 7828.71605
+  tps: 6410.87658
  }
 }
 dps_results: {
  key: "TestArms-AllItems-FuryoftheFiveFlights-40431"
  value: {
-  dps: 8104.62917
-  tps: 6626.01704
+  dps: 7803.21364
+  tps: 6384.18573
  }
 }
 dps_results: {
  key: "TestArms-AllItems-FuturesightRune-38763"
  value: {
-  dps: 7839.61895
-  tps: 6411.13873
+  dps: 7534.99709
+  tps: 6171.22115
  }
 }
 dps_results: {
  key: "TestArms-AllItems-Gladiator'sBattlegear"
  value: {
-  dps: 8020.75575
-  tps: 6519.28052
+  dps: 7707.46082
+  tps: 6259.40925
  }
 }
 dps_results: {
  key: "TestArms-AllItems-IllustrationoftheDragonSoul-40432"
  value: {
-  dps: 7839.61895
-  tps: 6411.13873
+  dps: 7534.99709
+  tps: 6171.22115
  }
 }
 dps_results: {
  key: "TestArms-AllItems-ImpassiveSkyflareDiamond"
  value: {
-  dps: 8204.61839
-  tps: 6711.7748
+  dps: 7862.45379
+  tps: 6438.8813
  }
 }
 dps_results: {
  key: "TestArms-AllItems-ImpassiveStarflareDiamond"
  value: {
-  dps: 8201.78077
-  tps: 6709.50554
+  dps: 7859.76475
+  tps: 6436.7282
  }
 }
 dps_results: {
  key: "TestArms-AllItems-IncisorFragment-37723"
  value: {
-  dps: 8089.19583
-  tps: 6617.70177
+  dps: 7797.84501
+  tps: 6382.25945
  }
 }
 dps_results: {
  key: "TestArms-AllItems-InsightfulEarthsiegeDiamond"
  value: {
-  dps: 8178.09963
-  tps: 6689.19606
+  dps: 7828.71605
+  tps: 6410.87658
  }
 }
 dps_results: {
  key: "TestArms-AllItems-InvigoratingEarthsiegeDiamond"
  value: {
-  dps: 8208.92995
-  tps: 6718.08535
+  dps: 7853.73551
+  tps: 6430.3831
  }
 }
 dps_results: {
  key: "TestArms-AllItems-Lavanthor'sTalisman-37872"
  value: {
-  dps: 7839.5789
-  tps: 6411.09869
+  dps: 7534.99709
+  tps: 6171.22115
  }
 }
 dps_results: {
  key: "TestArms-AllItems-MajesticDragonFigurine-40430"
  value: {
-  dps: 7839.61895
-  tps: 6411.13873
+  dps: 7534.99709
+  tps: 6171.22115
  }
 }
 dps_results: {
  key: "TestArms-AllItems-MeteoriteWhetstone-37390"
  value: {
-  dps: 8073.95574
-  tps: 6609.4158
+  dps: 7710.83561
+  tps: 6306.93847
  }
 }
 dps_results: {
  key: "TestArms-AllItems-OfferingofSacrifice-37638"
  value: {
-  dps: 7828.81416
-  tps: 6401.80513
+  dps: 7547.87433
+  tps: 6181.02239
  }
 }
 dps_results: {
  key: "TestArms-AllItems-OnslaughtArmor"
  value: {
-  dps: 5557.99567
-  tps: 4534.20925
+  dps: 5270.21941
+  tps: 4305.64749
  }
 }
 dps_results: {
  key: "TestArms-AllItems-OnslaughtBattlegear"
  value: {
-  dps: 6435.00972
-  tps: 5235.53988
+  dps: 6129.34771
+  tps: 4995.72748
  }
 }
 dps_results: {
  key: "TestArms-AllItems-PersistentEarthshatterDiamond"
  value: {
-  dps: 8206.27716
-  tps: 6715.85308
+  dps: 7866.47691
+  tps: 6439.5045
  }
 }
 dps_results: {
  key: "TestArms-AllItems-PersistentEarthsiegeDiamond"
  value: {
-  dps: 8208.92995
-  tps: 6718.08535
+  dps: 7853.73551
+  tps: 6430.3831
  }
 }
 dps_results: {
  key: "TestArms-AllItems-PowerfulEarthshatterDiamond"
  value: {
-  dps: 8178.09963
-  tps: 6689.19606
+  dps: 7828.71605
+  tps: 6410.87658
  }
 }
 dps_results: {
  key: "TestArms-AllItems-PowerfulEarthsiegeDiamond"
  value: {
-  dps: 8178.09963
-  tps: 6689.19606
+  dps: 7828.71605
+  tps: 6410.87658
  }
 }
 dps_results: {
  key: "TestArms-AllItems-PurifiedShardoftheGods"
  value: {
-  dps: 7839.61895
-  tps: 6411.13873
+  dps: 7534.99709
+  tps: 6171.22115
  }
 }
 dps_results: {
  key: "TestArms-AllItems-ReignoftheDead-47316"
  value: {
-  dps: 7839.61895
-  tps: 6411.13873
+  dps: 7534.99709
+  tps: 6171.22115
  }
 }
 dps_results: {
  key: "TestArms-AllItems-ReignoftheDead-47477"
  value: {
-  dps: 7839.61895
-  tps: 6411.13873
+  dps: 7534.99709
+  tps: 6171.22115
  }
 }
 dps_results: {
  key: "TestArms-AllItems-RelentlessEarthsiegeDiamond"
  value: {
-  dps: 8368.43645
-  tps: 6845.4762
+  dps: 8025.12564
+  tps: 6566.20895
  }
 }
 dps_results: {
  key: "TestArms-AllItems-RevitalizingSkyflareDiamond"
  value: {
-  dps: 8178.09963
-  tps: 6689.19606
+  dps: 7828.71605
+  tps: 6410.87658
  }
 }
 dps_results: {
  key: "TestArms-AllItems-RuneofRepulsion-40372"
  value: {
-  dps: 7839.61895
-  tps: 6411.13873
+  dps: 7534.99709
+  tps: 6171.22115
  }
 }
 dps_results: {
  key: "TestArms-AllItems-SealofthePantheon-36993"
  value: {
-  dps: 7843.21336
-  tps: 6414.59343
+  dps: 7540.32745
+  tps: 6174.2482
  }
 }
 dps_results: {
  key: "TestArms-AllItems-ShinyShardoftheGods"
  value: {
-  dps: 7839.61895
-  tps: 6411.13873
+  dps: 7534.99709
+  tps: 6171.22115
  }
 }
 dps_results: {
  key: "TestArms-AllItems-SiegebreakerBattlegear"
  value: {
-  dps: 7948.98347
-  tps: 6506.60885
+  dps: 7558.12468
+  tps: 6188.54581
  }
 }
 dps_results: {
  key: "TestArms-AllItems-SiegebreakerPlate"
  value: {
-  dps: 6893.96283
-  tps: 5612.44621
+  dps: 6614.73033
+  tps: 5384.91604
  }
 }
 dps_results: {
  key: "TestArms-AllItems-Sindragosa'sFlawlessFang-50361"
  value: {
-  dps: 7839.61895
-  tps: 6411.13873
+  dps: 7534.99709
+  tps: 6171.22115
  }
 }
 dps_results: {
  key: "TestArms-AllItems-SparkofLife-37657"
  value: {
-  dps: 7933.78465
-  tps: 6490.50022
+  dps: 7594.25246
+  tps: 6219.98239
  }
 }
 dps_results: {
  key: "TestArms-AllItems-SphereofRedDragon'sBlood-37166"
  value: {
-  dps: 8105.94048
-  tps: 6621.62892
+  dps: 7826.93819
+  tps: 6403.5775
  }
 }
 dps_results: {
  key: "TestArms-AllItems-StormshroudArmor"
  value: {
-  dps: 6541.49826
-  tps: 5338.82717
+  dps: 6217.79501
+  tps: 5079.80979
  }
 }
 dps_results: {
  key: "TestArms-AllItems-SwiftSkyflareDiamond"
  value: {
-  dps: 8208.92995
-  tps: 6718.08535
+  dps: 7853.73551
+  tps: 6430.3831
  }
 }
 dps_results: {
  key: "TestArms-AllItems-SwiftStarflareDiamond"
  value: {
-  dps: 8206.27716
-  tps: 6715.85308
+  dps: 7866.47691
+  tps: 6439.5045
  }
 }
 dps_results: {
  key: "TestArms-AllItems-SwiftWindfireDiamond"
  value: {
-  dps: 8210.32561
-  tps: 6719.50359
+  dps: 7853.77423
+  tps: 6429.67216
  }
 }
 dps_results: {
  key: "TestArms-AllItems-TheFistsofFury"
  value: {
-  dps: 4720.68252
-  tps: 3939.46216
+  dps: 4485.71392
+  tps: 3749.93647
  }
 }
 dps_results: {
  key: "TestArms-AllItems-TheTwinBladesofAzzinoth"
  value: {
-  dps: 5067.19453
-  tps: 4226.92972
+  dps: 4816.65127
+  tps: 4023.31353
  }
 }
 dps_results: {
  key: "TestArms-AllItems-ThunderingSkyflareDiamond"
  value: {
-  dps: 8206.37005
-  tps: 6712.86513
+  dps: 7865.55826
+  tps: 6440.48729
  }
 }
 dps_results: {
  key: "TestArms-AllItems-TinyAbominationinaJar-50351"
  value: {
-  dps: 8370.33989
-  tps: 6842.63111
+  dps: 8059.48631
+  tps: 6593.49053
  }
 }
 dps_results: {
  key: "TestArms-AllItems-TinyAbominationinaJar-50706"
  value: {
-  dps: 8434.84259
-  tps: 6901.95805
+  dps: 7988.3317
+  tps: 6536.9188
  }
 }
 dps_results: {
  key: "TestArms-AllItems-TirelessSkyflareDiamond"
  value: {
-  dps: 8178.09963
-  tps: 6689.19606
+  dps: 7828.71605
+  tps: 6410.87658
  }
 }
 dps_results: {
  key: "TestArms-AllItems-TirelessStarflareDiamond"
  value: {
-  dps: 8178.09963
-  tps: 6689.19606
+  dps: 7828.71605
+  tps: 6410.87658
  }
 }
 dps_results: {
  key: "TestArms-AllItems-TrenchantEarthshatterDiamond"
  value: {
-  dps: 8178.09963
-  tps: 6689.19606
+  dps: 7828.71605
+  tps: 6410.87658
  }
 }
 dps_results: {
  key: "TestArms-AllItems-TrenchantEarthsiegeDiamond"
  value: {
-  dps: 8178.09963
-  tps: 6689.19606
+  dps: 7828.71605
+  tps: 6410.87658
  }
 }
 dps_results: {
  key: "TestArms-AllItems-UndeadSlayer'sBlessedArmor"
  value: {
-  dps: 6806.95315
-  tps: 5561.42869
+  dps: 6516.55967
+  tps: 5329.00914
  }
 }
 dps_results: {
  key: "TestArms-AllItems-WingedTalisman-37844"
  value: {
-  dps: 7839.61895
-  tps: 6411.13873
+  dps: 7534.99709
+  tps: 6171.22115
  }
 }
 dps_results: {
  key: "TestArms-AllItems-Wrynn'sBattlegear"
  value: {
-  dps: 8195.96211
-  tps: 6684.81889
+  dps: 7888.77834
+  tps: 6435.45565
  }
 }
 dps_results: {
  key: "TestArms-AllItems-Wrynn'sPlate"
  value: {
-  dps: 6970.64343
-  tps: 5671.53732
+  dps: 6684.45524
+  tps: 5442.6894
  }
 }
 dps_results: {
  key: "TestArms-AllItems-YmirjarLord'sBattlegear"
  value: {
-  dps: 8615.04561
-  tps: 7053.41707
+  dps: 8312.05319
+  tps: 6808.83812
  }
 }
 dps_results: {
  key: "TestArms-AllItems-YmirjarLord'sPlate"
  value: {
-  dps: 7127.57005
-  tps: 5814.02485
+  dps: 6859.41234
+  tps: 5598.42034
  }
 }
 dps_results: {
  key: "TestArms-Average-Default"
  value: {
-  dps: 8354.17053
-  tps: 6837.44232
+  dps: 8023.4035
+  tps: 6571.28141
  }
 }
 dps_results: {
  key: "TestArms-Settings-Human-Arms P1-Basic-FullBuffs-LongMultiTarget"
  value: {
-  dps: 10930.69966
-  tps: 9319.2378
+  dps: 10504.65932
+  tps: 8965.45411
  }
 }
 dps_results: {
  key: "TestArms-Settings-Human-Arms P1-Basic-FullBuffs-LongSingleTarget"
  value: {
-  dps: 8324.40442
-  tps: 6811.09123
+  dps: 7998.74425
+  tps: 6542.91374
  }
 }
 dps_results: {
  key: "TestArms-Settings-Human-Arms P1-Basic-FullBuffs-ShortSingleTarget"
  value: {
-  dps: 8890.97686
-  tps: 7348.49781
+  dps: 8434.89301
+  tps: 6966.97763
  }
 }
 dps_results: {
  key: "TestArms-Settings-Human-Arms P1-Basic-NoBuffs-LongMultiTarget"
  value: {
-  dps: 6286.05472
-  tps: 5460.74912
+  dps: 6003.54954
+  tps: 5220.44931
  }
 }
 dps_results: {
  key: "TestArms-Settings-Human-Arms P1-Basic-NoBuffs-LongSingleTarget"
  value: {
-  dps: 4380.16062
-  tps: 3585.43514
+  dps: 4211.60309
+  tps: 3453.09907
  }
 }
 dps_results: {
  key: "TestArms-Settings-Human-Arms P1-Basic-NoBuffs-ShortSingleTarget"
  value: {
-  dps: 4324.56318
-  tps: 3568.25361
+  dps: 4131.39205
+  tps: 3412.10878
  }
 }
 dps_results: {
  key: "TestArms-Settings-Orc-Arms P1-Basic-FullBuffs-LongMultiTarget"
  value: {
-  dps: 10984.58722
-  tps: 9369.01956
+  dps: 10634.09117
+  tps: 9073.74793
  }
 }
 dps_results: {
  key: "TestArms-Settings-Orc-Arms P1-Basic-FullBuffs-LongSingleTarget"
  value: {
-  dps: 8365.95708
-  tps: 6841.64596
+  dps: 8027.47509
+  tps: 6568.08837
  }
 }
 dps_results: {
  key: "TestArms-Settings-Orc-Arms P1-Basic-FullBuffs-ShortSingleTarget"
  value: {
-  dps: 8938.55163
-  tps: 7385.97592
+  dps: 8546.12951
+  tps: 7063.91108
  }
 }
 dps_results: {
  key: "TestArms-Settings-Orc-Arms P1-Basic-NoBuffs-LongMultiTarget"
  value: {
-  dps: 6347.25539
-  tps: 5510.33334
+  dps: 6014.86156
+  tps: 5234.41386
  }
 }
 dps_results: {
  key: "TestArms-Settings-Orc-Arms P1-Basic-NoBuffs-LongSingleTarget"
  value: {
-  dps: 4439.8455
-  tps: 3637.85505
+  dps: 4258.78451
+  tps: 3497.87804
  }
 }
 dps_results: {
  key: "TestArms-Settings-Orc-Arms P1-Basic-NoBuffs-ShortSingleTarget"
  value: {
-  dps: 4381.20564
-  tps: 3620.04604
+  dps: 4199.03279
+  tps: 3466.82791
  }
 }
 dps_results: {
  key: "TestArms-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 7772.28086
-  tps: 6345.18718
+  dps: 7442.93567
+  tps: 6085.5329
  }
 }
diff --git a/sim/warrior/dps/TestFury.results b/sim/warrior/dps/TestFury.results
index 5be1df195d..a435349611 100644
--- a/sim/warrior/dps/TestFury.results
+++ b/sim/warrior/dps/TestFury.results
@@ -1,7 +1,7 @@
 character_stats_results: {
  key: "TestFury-CharacterStats-Default"
  value: {
-  final_stats: 1196.8
+  final_stats: 1185.8
   final_stats: 1001
   final_stats: 1889.25
   final_stats: 176
@@ -12,7 +12,7 @@ character_stats_results: {
   final_stats: 1145.55
   final_stats: 243
   final_stats: 0
-  final_stats: 6654.78917
+  final_stats: 6219.18917
   final_stats: 239.37
   final_stats: 2256.75564
   final_stats: 243
@@ -25,7 +25,7 @@ character_stats_results: {
   final_stats: 2945.8
   final_stats: 0
   final_stats: 0
-  final_stats: 598.4
+  final_stats: 592.9
   final_stats: 534.48245
   final_stats: 0
   final_stats: 0
@@ -45,658 +45,658 @@ character_stats_results: {
 dps_results: {
  key: "TestFury-AllItems-AshtongueTalismanofValor-32485"
  value: {
-  dps: 6462.7559
-  tps: 4752.88489
+  dps: 6219.91389
+  tps: 4580.76314
  }
 }
 dps_results: {
  key: "TestFury-AllItems-AustereEarthsiegeDiamond"
  value: {
-  dps: 6692.56863
-  tps: 4922.78755
+  dps: 6396.31768
+  tps: 4709.72408
  }
 }
 dps_results: {
  key: "TestFury-AllItems-Bandit'sInsignia-40371"
  value: {
-  dps: 6671.19688
-  tps: 4903.96995
+  dps: 6355.10796
+  tps: 4674.04882
  }
 }
 dps_results: {
  key: "TestFury-AllItems-BeamingEarthsiegeDiamond"
  value: {
-  dps: 6692.49442
-  tps: 4923.48787
+  dps: 6433.14911
+  tps: 4736.23954
  }
 }
 dps_results: {
  key: "TestFury-AllItems-Beast-tamer'sShoulders-30892"
  value: {
-  dps: 6493.01812
-  tps: 4783.2481
+  dps: 6195.47522
+  tps: 4565.69007
  }
 }
 dps_results: {
  key: "TestFury-AllItems-BlessedBattlegearofUndeadSlaying"
  value: {
-  dps: 5311.03763
-  tps: 3924.78896
+  dps: 5085.80317
+  tps: 3759.66375
  }
 }
 dps_results: {
  key: "TestFury-AllItems-BlessedGarboftheUndeadSlayer"
  value: {
-  dps: 5320.41861
-  tps: 3933.26402
+  dps: 5056.70073
+  tps: 3738.83101
  }
 }
 dps_results: {
  key: "TestFury-AllItems-BlessedRegaliaofUndeadCleansing"
  value: {
-  dps: 4989.36759
-  tps: 3692.08571
+  dps: 4773.83738
+  tps: 3536.48289
  }
 }
 dps_results: {
  key: "TestFury-AllItems-BracingEarthsiegeDiamond"
  value: {
-  dps: 6674.15924
-  tps: 4815.13852
+  dps: 6373.33159
+  tps: 4599.73319
  }
 }
 dps_results: {
  key: "TestFury-AllItems-ChaoticSkyflareDiamond"
  value: {
-  dps: 6847.93575
-  tps: 5035.08552
+  dps: 6548.72445
+  tps: 4825.3659
  }
 }
 dps_results: {
  key: "TestFury-AllItems-DarkmoonCard:Berserker!-42989"
  value: {
-  dps: 6610.0308
-  tps: 4862.23048
+  dps: 6329.58036
+  tps: 4658.47027
  }
 }
 dps_results: {
  key: "TestFury-AllItems-DarkmoonCard:Death-42990"
  value: {
-  dps: 6646.97442
-  tps: 4889.3954
+  dps: 6355.07168
+  tps: 4675.64794
  }
 }
 dps_results: {
  key: "TestFury-AllItems-DarkmoonCard:Greatness-44253"
  value: {
-  dps: 6583.35762
-  tps: 4840.91822
+  dps: 6274.2707
+  tps: 4618.41464
  }
 }
 dps_results: {
  key: "TestFury-AllItems-DarkmoonCard:Greatness-44254"
  value: {
-  dps: 6413.78756
-  tps: 4721.40361
+  dps: 6148.10999
+  tps: 4529.00308
  }
 }
 dps_results: {
  key: "TestFury-AllItems-DeathKnight'sAnguish-38212"
  value: {
-  dps: 6587.58621
-  tps: 4846.52611
+  dps: 6272.32564
+  tps: 4619.17458
  }
 }
 dps_results: {
  key: "TestFury-AllItems-Defender'sCode-40257"
  value: {
-  dps: 6471.30698
-  tps: 4763.46357
+  dps: 6179.34218
+  tps: 4551.04938
  }
 }
 dps_results: {
  key: "TestFury-AllItems-DestructiveSkyflareDiamond"
  value: {
-  dps: 6706.0184
-  tps: 4932.59208
+  dps: 6439.20906
+  tps: 4741.01504
  }
 }
 dps_results: {
  key: "TestFury-AllItems-DreadnaughtBattlegear"
  value: {
-  dps: 6034.3637
-  tps: 4448.33891
+  dps: 5779.07215
+  tps: 4268.09684
  }
 }
 dps_results: {
  key: "TestFury-AllItems-DreadnaughtPlate"
  value: {
-  dps: 5210.65452
-  tps: 3849.3291
+  dps: 5007.83408
+  tps: 3704.8971
  }
 }
 dps_results: {
  key: "TestFury-AllItems-EffulgentSkyflareDiamond"
  value: {
-  dps: 6674.15924
-  tps: 4913.22376
+  dps: 6373.33159
+  tps: 4693.42021
  }
 }
 dps_results: {
  key: "TestFury-AllItems-EmberSkyflareDiamond"
  value: {
-  dps: 6674.15924
-  tps: 4913.22376
+  dps: 6373.33159
+  tps: 4693.42021
  }
 }
 dps_results: {
  key: "TestFury-AllItems-EnigmaticSkyflareDiamond"
  value: {
-  dps: 6692.49442
-  tps: 4923.48787
+  dps: 6433.14911
+  tps: 4736.23954
  }
 }
 dps_results: {
  key: "TestFury-AllItems-EnigmaticStarflareDiamond"
  value: {
-  dps: 6674.61416
-  tps: 4911.92299
+  dps: 6428.91508
+  tps: 4732.52418
  }
 }
 dps_results: {
  key: "TestFury-AllItems-EternalEarthsiegeDiamond"
  value: {
-  dps: 6674.15924
-  tps: 4913.22376
+  dps: 6373.33159
+  tps: 4693.42021
  }
 }
 dps_results: {
  key: "TestFury-AllItems-ExtractofNecromanticPower-40373"
  value: {
-  dps: 6622.43646
-  tps: 4869.99736
+  dps: 6373.5278
+  tps: 4689.69137
  }
 }
 dps_results: {
  key: "TestFury-AllItems-EyeoftheBroodmother-45308"
  value: {
-  dps: 6594.55511
-  tps: 4852.43734
+  dps: 6321.77057
+  tps: 4652.99369
  }
 }
 dps_results: {
  key: "TestFury-AllItems-ForgeEmber-37660"
  value: {
-  dps: 6579.63633
-  tps: 4840.96205
+  dps: 6289.93814
+  tps: 4630.43627
  }
 }
 dps_results: {
  key: "TestFury-AllItems-ForlornSkyflareDiamond"
  value: {
-  dps: 6674.15924
-  tps: 4913.22376
+  dps: 6373.33159
+  tps: 4693.42021
  }
 }
 dps_results: {
  key: "TestFury-AllItems-ForlornStarflareDiamond"
  value: {
-  dps: 6674.15924
-  tps: 4913.22376
+  dps: 6373.33159
+  tps: 4693.42021
  }
 }
 dps_results: {
  key: "TestFury-AllItems-FuryoftheFiveFlights-40431"
  value: {
-  dps: 6681.54462
-  tps: 4914.63416
+  dps: 6427.34315
+  tps: 4729.30288
  }
 }
 dps_results: {
  key: "TestFury-AllItems-FuturesightRune-38763"
  value: {
-  dps: 6413.78756
-  tps: 4721.40361
+  dps: 6148.10999
+  tps: 4529.00308
  }
 }
 dps_results: {
  key: "TestFury-AllItems-Gladiator'sBattlegear"
  value: {
-  dps: 6371.87841
-  tps: 4687.15613
+  dps: 6124.93742
+  tps: 4510.43552
  }
 }
 dps_results: {
  key: "TestFury-AllItems-IllustrationoftheDragonSoul-40432"
  value: {
-  dps: 6413.78756
-  tps: 4721.40361
+  dps: 6148.10999
+  tps: 4529.00308
  }
 }
 dps_results: {
  key: "TestFury-AllItems-ImpassiveSkyflareDiamond"
  value: {
-  dps: 6692.49442
-  tps: 4923.48787
+  dps: 6433.14911
+  tps: 4736.23954
  }
 }
 dps_results: {
  key: "TestFury-AllItems-ImpassiveStarflareDiamond"
  value: {
-  dps: 6674.61416
-  tps: 4911.92299
+  dps: 6428.91508
+  tps: 4732.52418
  }
 }
 dps_results: {
  key: "TestFury-AllItems-IncisorFragment-37723"
  value: {
-  dps: 6677.12519
-  tps: 4907.29632
+  dps: 6367.31953
+  tps: 4686.19111
  }
 }
 dps_results: {
  key: "TestFury-AllItems-InsightfulEarthsiegeDiamond"
  value: {
-  dps: 6674.15924
-  tps: 4913.22376
+  dps: 6373.33159
+  tps: 4693.42021
  }
 }
 dps_results: {
  key: "TestFury-AllItems-InvigoratingEarthsiegeDiamond"
  value: {
-  dps: 6701.80892
-  tps: 4929.15509
+  dps: 6422.61505
+  tps: 4730.54659
  }
 }
 dps_results: {
  key: "TestFury-AllItems-Lavanthor'sTalisman-37872"
  value: {
-  dps: 6413.78756
-  tps: 4721.40361
+  dps: 6148.10999
+  tps: 4529.00308
  }
 }
 dps_results: {
  key: "TestFury-AllItems-MajesticDragonFigurine-40430"
  value: {
-  dps: 6413.78756
-  tps: 4721.40361
+  dps: 6148.10999
+  tps: 4529.00308
  }
 }
 dps_results: {
  key: "TestFury-AllItems-MeteoriteWhetstone-37390"
  value: {
-  dps: 6655.26289
-  tps: 4896.48633
+  dps: 6371.90983
+  tps: 4690.72025
  }
 }
 dps_results: {
  key: "TestFury-AllItems-OfferingofSacrifice-37638"
  value: {
-  dps: 6481.06684
-  tps: 4769.84359
+  dps: 6152.3276
+  tps: 4532.14794
  }
 }
 dps_results: {
  key: "TestFury-AllItems-OnslaughtArmor"
  value: {
-  dps: 4077.17846
-  tps: 3025.74366
+  dps: 3853.70925
+  tps: 2864.84391
  }
 }
 dps_results: {
  key: "TestFury-AllItems-OnslaughtBattlegear"
  value: {
-  dps: 4875.23695
-  tps: 3607.52242
+  dps: 4630.20863
+  tps: 3431.47846
  }
 }
 dps_results: {
  key: "TestFury-AllItems-PersistentEarthshatterDiamond"
  value: {
-  dps: 6682.86163
-  tps: 4915.44475
+  dps: 6381.94748
+  tps: 4700.40965
  }
 }
 dps_results: {
  key: "TestFury-AllItems-PersistentEarthsiegeDiamond"
  value: {
-  dps: 6701.80892
-  tps: 4929.15509
+  dps: 6422.61505
+  tps: 4730.54659
  }
 }
 dps_results: {
  key: "TestFury-AllItems-PowerfulEarthshatterDiamond"
  value: {
-  dps: 6674.15924
-  tps: 4913.22376
+  dps: 6373.33159
+  tps: 4693.42021
  }
 }
 dps_results: {
  key: "TestFury-AllItems-PowerfulEarthsiegeDiamond"
  value: {
-  dps: 6674.15924
-  tps: 4913.22376
+  dps: 6373.33159
+  tps: 4693.42021
  }
 }
 dps_results: {
  key: "TestFury-AllItems-PurifiedShardoftheGods"
  value: {
-  dps: 6413.78756
-  tps: 4721.40361
+  dps: 6148.10999
+  tps: 4529.00308
  }
 }
 dps_results: {
  key: "TestFury-AllItems-ReignoftheDead-47316"
  value: {
-  dps: 6413.78756
-  tps: 4721.40361
+  dps: 6148.10999
+  tps: 4529.00308
  }
 }
 dps_results: {
  key: "TestFury-AllItems-ReignoftheDead-47477"
  value: {
-  dps: 6413.78756
-  tps: 4721.40361
+  dps: 6148.10999
+  tps: 4529.00308
  }
 }
 dps_results: {
  key: "TestFury-AllItems-RelentlessEarthsiegeDiamond"
  value: {
-  dps: 6838.30563
-  tps: 5027.56997
+  dps: 6558.57622
+  tps: 4830.49539
  }
 }
 dps_results: {
  key: "TestFury-AllItems-RevitalizingSkyflareDiamond"
  value: {
-  dps: 6674.15924
-  tps: 4913.22376
+  dps: 6373.33159
+  tps: 4693.42021
  }
 }
 dps_results: {
  key: "TestFury-AllItems-RuneofRepulsion-40372"
  value: {
-  dps: 6413.78756
-  tps: 4721.40361
+  dps: 6148.10999
+  tps: 4529.00308
  }
 }
 dps_results: {
  key: "TestFury-AllItems-SealofthePantheon-36993"
  value: {
-  dps: 6491.6785
-  tps: 4777.46725
+  dps: 6177.28922
+  tps: 4553.84846
  }
 }
 dps_results: {
  key: "TestFury-AllItems-ShinyShardoftheGods"
  value: {
-  dps: 6413.78756
-  tps: 4721.40361
+  dps: 6148.10999
+  tps: 4529.00308
  }
 }
 dps_results: {
  key: "TestFury-AllItems-SiegebreakerBattlegear"
  value: {
-  dps: 6294.98506
-  tps: 4635.63878
+  dps: 6015.66255
+  tps: 4435.7878
  }
 }
 dps_results: {
  key: "TestFury-AllItems-SiegebreakerPlate"
  value: {
-  dps: 5342.62331
-  tps: 3945.48403
+  dps: 5097.27481
+  tps: 3768.20951
  }
 }
 dps_results: {
  key: "TestFury-AllItems-Sindragosa'sFlawlessFang-50361"
  value: {
-  dps: 6413.78756
-  tps: 4721.40361
+  dps: 6148.10999
+  tps: 4529.00308
  }
 }
 dps_results: {
  key: "TestFury-AllItems-SparkofLife-37657"
  value: {
-  dps: 6521.85499
-  tps: 4798.09348
+  dps: 6284.6449
+  tps: 4625.41996
  }
 }
 dps_results: {
  key: "TestFury-AllItems-SphereofRedDragon'sBlood-37166"
  value: {
-  dps: 6668.4325
-  tps: 4902.5523
+  dps: 6395.63525
+  tps: 4709.49155
  }
 }
 dps_results: {
  key: "TestFury-AllItems-StormshroudArmor"
  value: {
-  dps: 4948.7995
-  tps: 3661.0157
+  dps: 4709.29922
+  tps: 3488.13499
  }
 }
 dps_results: {
  key: "TestFury-AllItems-SwiftSkyflareDiamond"
  value: {
-  dps: 6701.80892
-  tps: 4929.15509
+  dps: 6422.61505
+  tps: 4730.54659
  }
 }
 dps_results: {
  key: "TestFury-AllItems-SwiftStarflareDiamond"
  value: {
-  dps: 6682.86163
-  tps: 4915.44475
+  dps: 6381.94748
+  tps: 4700.40965
  }
 }
 dps_results: {
  key: "TestFury-AllItems-SwiftWindfireDiamond"
  value: {
-  dps: 6706.39278
-  tps: 4932.86311
+  dps: 6423.38837
+  tps: 4728.98094
  }
 }
 dps_results: {
  key: "TestFury-AllItems-TheFistsofFury"
  value: {
-  dps: 4993.63335
-  tps: 3686.71276
+  dps: 4712.60418
+  tps: 3483.7133
  }
 }
 dps_results: {
  key: "TestFury-AllItems-TheTwinBladesofAzzinoth"
  value: {
-  dps: 5302.90666
-  tps: 3909.22354
+  dps: 5031.38621
+  tps: 3713.51512
  }
 }
 dps_results: {
  key: "TestFury-AllItems-ThunderingSkyflareDiamond"
  value: {
-  dps: 6675.33038
-  tps: 4913.7146
+  dps: 6451.82147
+  tps: 4751.73583
  }
 }
 dps_results: {
  key: "TestFury-AllItems-TinyAbominationinaJar-50351"
  value: {
-  dps: 6803.43196
-  tps: 5004.96698
+  dps: 6540.91621
+  tps: 4813.39875
  }
 }
 dps_results: {
  key: "TestFury-AllItems-TinyAbominationinaJar-50706"
  value: {
-  dps: 6886.88712
-  tps: 5063.99425
+  dps: 6582.2044
+  tps: 4846.58239
  }
 }
 dps_results: {
  key: "TestFury-AllItems-TirelessSkyflareDiamond"
  value: {
-  dps: 6674.15924
-  tps: 4913.22376
+  dps: 6373.33159
+  tps: 4693.42021
  }
 }
 dps_results: {
  key: "TestFury-AllItems-TirelessStarflareDiamond"
  value: {
-  dps: 6674.15924
-  tps: 4913.22376
+  dps: 6373.33159
+  tps: 4693.42021
  }
 }
 dps_results: {
  key: "TestFury-AllItems-TrenchantEarthshatterDiamond"
  value: {
-  dps: 6674.15924
-  tps: 4913.22376
+  dps: 6373.33159
+  tps: 4693.42021
  }
 }
 dps_results: {
  key: "TestFury-AllItems-TrenchantEarthsiegeDiamond"
  value: {
-  dps: 6674.15924
-  tps: 4913.22376
+  dps: 6373.33159
+  tps: 4693.42021
  }
 }
 dps_results: {
  key: "TestFury-AllItems-UndeadSlayer'sBlessedArmor"
  value: {
-  dps: 5324.59086
-  tps: 3933.90428
+  dps: 5070.65622
+  tps: 3752.2609
  }
 }
 dps_results: {
  key: "TestFury-AllItems-WingedTalisman-37844"
  value: {
-  dps: 6413.78756
-  tps: 4721.40361
+  dps: 6148.10999
+  tps: 4529.00308
  }
 }
 dps_results: {
  key: "TestFury-AllItems-Wrynn'sBattlegear"
  value: {
-  dps: 6484.37751
-  tps: 4773.86608
+  dps: 6266.90969
+  tps: 4615.82744
  }
 }
 dps_results: {
  key: "TestFury-AllItems-Wrynn'sPlate"
  value: {
-  dps: 5416.64157
-  tps: 4002.46724
+  dps: 5150.42971
+  tps: 3806.1277
  }
 }
 dps_results: {
  key: "TestFury-AllItems-YmirjarLord'sBattlegear"
  value: {
-  dps: 7103.20253
-  tps: 5232.34609
+  dps: 6784.94386
+  tps: 5002.22748
  }
 }
 dps_results: {
  key: "TestFury-AllItems-YmirjarLord'sPlate"
  value: {
-  dps: 5628.65073
-  tps: 4154.87426
+  dps: 5375.84355
+  tps: 3971.76959
  }
 }
 dps_results: {
  key: "TestFury-Average-Default"
  value: {
-  dps: 6875.5254
-  tps: 5057.22187
+  dps: 6581.62904
+  tps: 4844.98852
  }
 }
 dps_results: {
  key: "TestFury-Settings-Human-Fury P1-Basic-FullBuffs-LongMultiTarget"
  value: {
-  dps: 8776.35794
-  tps: 6829.40809
+  dps: 8388.76025
+  tps: 6537.47528
  }
 }
 dps_results: {
  key: "TestFury-Settings-Human-Fury P1-Basic-FullBuffs-LongSingleTarget"
  value: {
-  dps: 6799.4509
-  tps: 4998.45194
+  dps: 6501.83588
+  tps: 4787.52628
  }
 }
 dps_results: {
  key: "TestFury-Settings-Human-Fury P1-Basic-FullBuffs-ShortSingleTarget"
  value: {
-  dps: 7830.1798
-  tps: 5756.00419
+  dps: 7507.62918
+  tps: 5525.02698
  }
 }
 dps_results: {
  key: "TestFury-Settings-Human-Fury P1-Basic-NoBuffs-LongMultiTarget"
  value: {
-  dps: 4744.33308
-  tps: 3835.47816
+  dps: 4509.78772
+  tps: 3660.27047
  }
 }
 dps_results: {
  key: "TestFury-Settings-Human-Fury P1-Basic-NoBuffs-LongSingleTarget"
  value: {
-  dps: 3302.9378
-  tps: 2459.32914
+  dps: 3153.64029
+  tps: 2349.0122
  }
 }
 dps_results: {
  key: "TestFury-Settings-Human-Fury P1-Basic-NoBuffs-ShortSingleTarget"
  value: {
-  dps: 3474.72263
-  tps: 2587.64034
+  dps: 3353.89383
+  tps: 2498.63949
  }
 }
 dps_results: {
  key: "TestFury-Settings-Orc-Fury P1-Basic-FullBuffs-LongMultiTarget"
  value: {
-  dps: 8875.72529
-  tps: 6908.2774
+  dps: 8491.21668
+  tps: 6617.84351
  }
 }
 dps_results: {
  key: "TestFury-Settings-Orc-Fury P1-Basic-FullBuffs-LongSingleTarget"
  value: {
-  dps: 6847.93575
-  tps: 5035.08552
+  dps: 6548.72445
+  tps: 4825.3659
  }
 }
 dps_results: {
  key: "TestFury-Settings-Orc-Fury P1-Basic-FullBuffs-ShortSingleTarget"
  value: {
-  dps: 7964.61338
-  tps: 5851.84917
+  dps: 7600.94651
+  tps: 5589.16979
  }
 }
 dps_results: {
  key: "TestFury-Settings-Orc-Fury P1-Basic-NoBuffs-LongMultiTarget"
  value: {
-  dps: 4877.89103
-  tps: 3938.72336
+  dps: 4573.25026
+  tps: 3712.61576
  }
 }
 dps_results: {
  key: "TestFury-Settings-Orc-Fury P1-Basic-NoBuffs-LongSingleTarget"
  value: {
-  dps: 3331.53694
-  tps: 2480.12489
+  dps: 3163.79686
+  tps: 2357.43738
  }
 }
 dps_results: {
  key: "TestFury-Settings-Orc-Fury P1-Basic-NoBuffs-ShortSingleTarget"
  value: {
-  dps: 3495.93452
-  tps: 2601.67668
+  dps: 3363.72571
+  tps: 2512.29632
  }
 }
 dps_results: {
  key: "TestFury-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 6343.64168
-  tps: 4668.48159
+  dps: 6064.79734
+  tps: 4466.37111
  }
 }
diff --git a/sim/warrior/protection/TestProtectionWarrior.results b/sim/warrior/protection/TestProtectionWarrior.results
index c2f33f79ad..a60c1b0760 100644
--- a/sim/warrior/protection/TestProtectionWarrior.results
+++ b/sim/warrior/protection/TestProtectionWarrior.results
@@ -1,7 +1,7 @@
 character_stats_results: {
  key: "TestProtectionWarrior-CharacterStats-Default"
  value: {
-  final_stats: 1506.472
+  final_stats: 1494.812
   final_stats: 449.9
   final_stats: 2818.3375
   final_stats: 185.9
@@ -12,7 +12,7 @@ character_stats_results: {
   final_stats: 254.55
   final_stats: 0
   final_stats: 0
-  final_stats: 5653.2839
+  final_stats: 5216.2319
   final_stats: 226
   final_stats: 823.20962
   final_stats: 0
@@ -25,7 +25,7 @@ character_stats_results: {
   final_stats: 755.7
   final_stats: 672
   final_stats: 170.95
-  final_stats: 1439.236
+  final_stats: 1433.406
   final_stats: 379.22343
   final_stats: 299
   final_stats: 15
@@ -45,7 +45,7 @@ character_stats_results: {
 stat_weights_results: {
  key: "TestProtectionWarrior-StatWeights-Default"
  value: {
-  weights: 0.84442
+  weights: 0.81947
   weights: 0
   weights: 0
   weights: 0
@@ -56,7 +56,7 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.15401
+  weights: 0.50194
   weights: 0
   weights: 0
   weights: 0
@@ -65,12 +65,12 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: -0.01995
+  weights: 0.00203
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.46949
-  weights: 0.10933
+  weights: 0.46582
+  weights: 0.13276
   weights: 0
   weights: 0
   weights: 0
@@ -89,660 +89,660 @@ stat_weights_results: {
 dps_results: {
  key: "TestProtectionWarrior-AllItems-AshtongueTalismanofValor-32485"
  value: {
-  dps: 2057.50575
-  tps: 5947.6898
+  dps: 1950.15851
+  tps: 5660.80847
  }
 }
 dps_results: {
  key: "TestProtectionWarrior-AllItems-AustereEarthsiegeDiamond"
  value: {
-  dps: 2028.69407
-  tps: 5875.89625
+  dps: 1913.85402
+  tps: 5564.40478
  }
 }
 dps_results: {
  key: "TestProtectionWarrior-AllItems-Bandit'sInsignia-40371"
  value: {
-  dps: 2117.6584
-  tps: 6087.37342
+  dps: 2028.7405
+  tps: 5849.80764
  }
 }
 dps_results: {
  key: "TestProtectionWarrior-AllItems-BeamingEarthsiegeDiamond"
  value: {
-  dps: 2042.39299
-  tps: 5902.09874
+  dps: 1936.5521
+  tps: 5622.03779
  }
 }
 dps_results: {
  key: "TestProtectionWarrior-AllItems-Beast-tamer'sShoulders-30892"
  value: {
-  dps: 1999.28854
-  tps: 5783.4036
+  dps: 1899.67263
+  tps: 5513.34963
  }
 }
 dps_results: {
  key: "TestProtectionWarrior-AllItems-BlessedBattlegearofUndeadSlaying"
  value: {
-  dps: 1754.64932
-  tps: 5118.4188
+  dps: 1664.3033
+  tps: 4879.6404
  }
 }
 dps_results: {
  key: "TestProtectionWarrior-AllItems-BlessedGarboftheUndeadSlayer"
  value: {
-  dps: 1735.99044
-  tps: 5059.52327
+  dps: 1620.29595
+  tps: 4742.37196
  }
 }
 dps_results: {
  key: "TestProtectionWarrior-AllItems-BlessedRegaliaofUndeadCleansing"
  value: {
-  dps: 1623.72694
-  tps: 4773.10695
+  dps: 1526.81037
+  tps: 4503.17919
  }
 }
 dps_results: {
  key: "TestProtectionWarrior-AllItems-BracingEarthsiegeDiamond"
  value: {
-  dps: 2027.35122
-  tps: 5748.07804
+  dps: 1895.69557
+  tps: 5406.06299
  }
 }
 dps_results: {
  key: "TestProtectionWarrior-AllItems-ChaoticSkyflareDiamond"
  value: {
-  dps: 2067.09469
-  tps: 5963.62853
+  dps: 1972.67787
+  tps: 5717.76394
  }
 }
 dps_results: {
  key: "TestProtectionWarrior-AllItems-DarkmoonCard:Berserker!-42989"
  value: {
-  dps: 2099.60854
-  tps: 6044.45512
+  dps: 2001.17468
+  tps: 5783.98963
  }
 }
 dps_results: {
  key: "TestProtectionWarrior-AllItems-DarkmoonCard:Death-42990"
  value: {
-  dps: 2132.38006
-  tps: 6111.01148
+  dps: 2037.94233
+  tps: 5854.67739
  }
 }
 dps_results: {
  key: "TestProtectionWarrior-AllItems-DarkmoonCard:Greatness-42987"
  value: {
-  dps: 2154.0603
-  tps: 6211.52471
+  dps: 2052.31811
+  tps: 5931.77574
  }
 }
 dps_results: {
  key: "TestProtectionWarrior-AllItems-DarkmoonCard:Greatness-44253"
  value: {
-  dps: 2157.38453
-  tps: 6204.03082
+  dps: 2051.31749
+  tps: 5919.86697
  }
 }
 dps_results: {
  key: "TestProtectionWarrior-AllItems-DarkmoonCard:Greatness-44254"
  value: {
-  dps: 2096.03294
-  tps: 6061.59679
+  dps: 2011.24198
+  tps: 5826.10211
  }
 }
 dps_results: {
  key: "TestProtectionWarrior-AllItems-DeathKnight'sAnguish-38212"
  value: {
-  dps: 2091.96244
-  tps: 6039.8868
+  dps: 1984.55362
+  tps: 5735.63657
  }
 }
 dps_results: {
  key: "TestProtectionWarrior-AllItems-DestructiveSkyflareDiamond"
  value: {
-  dps: 2047.11613
-  tps: 5914.09536
+  dps: 1939.17936
+  tps: 5627.25049
  }
 }
 dps_results: {
  key: "TestProtectionWarrior-AllItems-DreadnaughtBattlegear"
  value: {
-  dps: 2205.09035
-  tps: 6294.71973
+  dps: 2081.4689
+  tps: 5968.36448
  }
 }
 dps_results: {
  key: "TestProtectionWarrior-AllItems-DreadnaughtPlate"
  value: {
-  dps: 1915.05327
-  tps: 5560.20869
+  dps: 1840.28305
+  tps: 5357.12641
  }
 }
 dps_results: {
  key: "TestProtectionWarrior-AllItems-EffulgentSkyflareDiamond"
  value: {
-  dps: 2027.35122
-  tps: 5865.33473
+  dps: 1895.69557
+  tps: 5516.33979
  }
 }
 dps_results: {
  key: "TestProtectionWarrior-AllItems-EmberSkyflareDiamond"
  value: {
-  dps: 2027.35122
-  tps: 5865.33473
+  dps: 1895.69557
+  tps: 5516.33979
  }
 }
 dps_results: {
  key: "TestProtectionWarrior-AllItems-EnigmaticSkyflareDiamond"
  value: {
-  dps: 2042.39299
-  tps: 5902.09874
+  dps: 1936.5521
+  tps: 5622.03779
  }
 }
 dps_results: {
  key: "TestProtectionWarrior-AllItems-EnigmaticStarflareDiamond"
  value: {
-  dps: 2038.97464
-  tps: 5894.15266
+  dps: 1938.09402
+  tps: 5626.20992
  }
 }
 dps_results: {
  key: "TestProtectionWarrior-AllItems-EternalEarthsiegeDiamond"
  value: {
-  dps: 2041.59003
-  tps: 5903.71616
+  dps: 1909.29818
+  tps: 5553.00632
  }
 }
 dps_results: {
  key: "TestProtectionWarrior-AllItems-ExtractofNecromanticPower-40373"
  value: {
-  dps: 2121.26702
-  tps: 6083.94805
+  dps: 2037.88538
+  tps: 5863.10846
  }
 }
 dps_results: {
  key: "TestProtectionWarrior-AllItems-EyeoftheBroodmother-45308"
  value: {
-  dps: 2082.43003
-  tps: 6000.17261
+  dps: 1995.96282
+  tps: 5770.82601
  }
 }
 dps_results: {
  key: "TestProtectionWarrior-AllItems-ForgeEmber-37660"
  value: {
-  dps: 2072.80836
-  tps: 5979.43775
+  dps: 1985.49215
+  tps: 5745.20497
  }
 }
 dps_results: {
  key: "TestProtectionWarrior-AllItems-ForlornSkyflareDiamond"
  value: {
-  dps: 2027.35122
-  tps: 5865.33473
+  dps: 1895.69557
+  tps: 5516.33979
  }
 }
 dps_results: {
  key: "TestProtectionWarrior-AllItems-ForlornStarflareDiamond"
  value: {
-  dps: 2027.35122
-  tps: 5865.33473
+  dps: 1895.69557
+  tps: 5516.33979
  }
 }
 dps_results: {
  key: "TestProtectionWarrior-AllItems-FuryoftheFiveFlights-40431"
  value: {
-  dps: 2095.7125
-  tps: 6052.11808
+  dps: 1994.65307
+  tps: 5784.64729
  }
 }
 dps_results: {
  key: "TestProtectionWarrior-AllItems-FuturesightRune-38763"
  value: {
-  dps: 2028.69407
-  tps: 5875.89625
+  dps: 1913.85402
+  tps: 5564.40478
  }
 }
 dps_results: {
  key: "TestProtectionWarrior-AllItems-Gladiator'sBattlegear"
  value: {
-  dps: 2343.56598
-  tps: 6582.4187
+  dps: 2242.05889
+  tps: 6316.39056
  }
 }
 dps_results: {
  key: "TestProtectionWarrior-AllItems-IllustrationoftheDragonSoul-40432"
  value: {
-  dps: 2028.69407
-  tps: 5875.89625
+  dps: 1913.85402
+  tps: 5564.40478
  }
 }
 dps_results: {
  key: "TestProtectionWarrior-AllItems-ImpassiveSkyflareDiamond"
  value: {
-  dps: 2042.39299
-  tps: 5902.09874
+  dps: 1936.5521
+  tps: 5622.03779
  }
 }
 dps_results: {
  key: "TestProtectionWarrior-AllItems-ImpassiveStarflareDiamond"
  value: {
-  dps: 2038.97464
-  tps: 5894.15266
+  dps: 1938.09402
+  tps: 5626.20992
  }
 }
 dps_results: {
  key: "TestProtectionWarrior-AllItems-IncisorFragment-37723"
  value: {
-  dps: 2117.62527
-  tps: 6104.79822
+  dps: 2010.79973
+  tps: 5821.76981
  }
 }
 dps_results: {
  key: "TestProtectionWarrior-AllItems-InsightfulEarthsiegeDiamond"
  value: {
-  dps: 2027.35122
-  tps: 5865.33473
+  dps: 1895.69557
+  tps: 5516.33979
  }
 }
 dps_results: {
  key: "TestProtectionWarrior-AllItems-InvigoratingEarthsiegeDiamond"
  value: {
-  dps: 2028.53175
-  tps: 5862.37508
+  dps: 1937.6516
+  tps: 5636.9828
  }
 }
 dps_results: {
  key: "TestProtectionWarrior-AllItems-Lavanthor'sTalisman-37872"
  value: {
-  dps: 2041.69142
-  tps: 5910.93126
+  dps: 1927.67289
+  tps: 5601.65423
  }
 }
 dps_results: {
  key: "TestProtectionWarrior-AllItems-MajesticDragonFigurine-40430"
  value: {
-  dps: 2028.69407
-  tps: 5875.89625
+  dps: 1913.85402
+  tps: 5564.40478
  }
 }
 dps_results: {
  key: "TestProtectionWarrior-AllItems-MeteoriteWhetstone-37390"
  value: {
-  dps: 2113.09377
-  tps: 6089.27098
+  dps: 1996.94191
+  tps: 5779.05364
  }
 }
 dps_results: {
  key: "TestProtectionWarrior-AllItems-OfferingofSacrifice-37638"
  value: {
-  dps: 2036.65094
-  tps: 5891.45864
+  dps: 1929.32438
+  tps: 5609.46217
  }
 }
 dps_results: {
  key: "TestProtectionWarrior-AllItems-OnslaughtArmor"
  value: {
-  dps: 1589.44895
-  tps: 4666.21525
+  dps: 1492.36492
+  tps: 4403.92347
  }
 }
 dps_results: {
  key: "TestProtectionWarrior-AllItems-OnslaughtBattlegear"
  value: {
-  dps: 1786.28909
-  tps: 5152.8002
+  dps: 1683.02861
+  tps: 4874.63455
  }
 }
 dps_results: {
  key: "TestProtectionWarrior-AllItems-PersistentEarthshatterDiamond"
  value: {
-  dps: 2036.26576
-  tps: 5891.20619
+  dps: 1929.39148
+  tps: 5614.32334
  }
 }
 dps_results: {
  key: "TestProtectionWarrior-AllItems-PersistentEarthsiegeDiamond"
  value: {
-  dps: 2028.53175
-  tps: 5862.37508
+  dps: 1937.6516
+  tps: 5636.9828
  }
 }
 dps_results: {
  key: "TestProtectionWarrior-AllItems-PowerfulEarthshatterDiamond"
  value: {
-  dps: 2027.35122
-  tps: 5865.33473
+  dps: 1895.69557
+  tps: 5516.33979
  }
 }
 dps_results: {
  key: "TestProtectionWarrior-AllItems-PowerfulEarthsiegeDiamond"
  value: {
-  dps: 2027.35122
-  tps: 5865.33473
+  dps: 1895.69557
+  tps: 5516.33979
  }
 }
 dps_results: {
  key: "TestProtectionWarrior-AllItems-PurifiedShardoftheGods"
  value: {
-  dps: 2028.69407
-  tps: 5875.89625
+  dps: 1913.85402
+  tps: 5564.40478
  }
 }
 dps_results: {
  key: "TestProtectionWarrior-AllItems-ReignoftheDead-47316"
  value: {
-  dps: 2028.69407
-  tps: 5875.89625
+  dps: 1913.85402
+  tps: 5564.40478
  }
 }
 dps_results: {
  key: "TestProtectionWarrior-AllItems-ReignoftheDead-47477"
  value: {
-  dps: 2028.69407
-  tps: 5875.89625
+  dps: 1913.85402
+  tps: 5564.40478
  }
 }
 dps_results: {
  key: "TestProtectionWarrior-AllItems-RelentlessEarthsiegeDiamond"
  value: {
-  dps: 2053.86842
-  tps: 5928.63372
+  dps: 1969.04379
+  tps: 5707.6697
  }
 }
 dps_results: {
  key: "TestProtectionWarrior-AllItems-RevitalizingSkyflareDiamond"
  value: {
-  dps: 2027.35122
-  tps: 5865.33473
+  dps: 1895.69557
+  tps: 5516.33979
  }
 }
 dps_results: {
  key: "TestProtectionWarrior-AllItems-RuneofRepulsion-40372"
  value: {
-  dps: 2028.69407
-  tps: 5875.89625
+  dps: 1913.85402
+  tps: 5564.40478
  }
 }
 dps_results: {
  key: "TestProtectionWarrior-AllItems-SealofthePantheon-36993"
  value: {
-  dps: 2025.51702
-  tps: 5863.15536
+  dps: 1915.71545
+  tps: 5575.60722
  }
 }
 dps_results: {
  key: "TestProtectionWarrior-AllItems-ShinyShardoftheGods"
  value: {
-  dps: 2028.69407
-  tps: 5875.89625
+  dps: 1913.85402
+  tps: 5564.40478
  }
 }
 dps_results: {
  key: "TestProtectionWarrior-AllItems-SiegebreakerBattlegear"
  value: {
-  dps: 2190.69255
-  tps: 6267.54049
+  dps: 2088.78271
+  tps: 5989.9663
  }
 }
 dps_results: {
  key: "TestProtectionWarrior-AllItems-SiegebreakerPlate"
  value: {
-  dps: 2005.54496
-  tps: 5771.20754
+  dps: 1919.63889
+  tps: 5532.45246
  }
 }
 dps_results: {
  key: "TestProtectionWarrior-AllItems-Sindragosa'sFlawlessFang-50361"
  value: {
-  dps: 2028.69407
-  tps: 5875.89625
+  dps: 1913.85402
+  tps: 5564.40478
  }
 }
 dps_results: {
  key: "TestProtectionWarrior-AllItems-SparkofLife-37657"
  value: {
-  dps: 2039.94815
-  tps: 5897.75982
+  dps: 1956.76298
+  tps: 5686.25149
  }
 }
 dps_results: {
  key: "TestProtectionWarrior-AllItems-SphereofRedDragon'sBlood-37166"
  value: {
-  dps: 2103.39239
-  tps: 6090.07282
+  dps: 1998.62271
+  tps: 5802.06576
  }
 }
 dps_results: {
  key: "TestProtectionWarrior-AllItems-StormshroudArmor"
  value: {
-  dps: 1593.99651
-  tps: 4685.00704
+  dps: 1506.00966
+  tps: 4440.3059
  }
 }
 dps_results: {
  key: "TestProtectionWarrior-AllItems-SwiftSkyflareDiamond"
  value: {
-  dps: 2028.53175
-  tps: 5862.37508
+  dps: 1937.6516
+  tps: 5636.9828
  }
 }
 dps_results: {
  key: "TestProtectionWarrior-AllItems-SwiftStarflareDiamond"
  value: {
-  dps: 2036.26576
-  tps: 5891.20619
+  dps: 1929.39148
+  tps: 5614.32334
  }
 }
 dps_results: {
  key: "TestProtectionWarrior-AllItems-SwiftWindfireDiamond"
  value: {
-  dps: 2032.74296
-  tps: 5883.92471
+  dps: 1930.10039
+  tps: 5612.21015
  }
 }
 dps_results: {
  key: "TestProtectionWarrior-AllItems-TheFistsofFury"
  value: {
-  dps: 1570.20148
-  tps: 4511.69454
+  dps: 1447.67743
+  tps: 4181.67857
  }
 }
 dps_results: {
  key: "TestProtectionWarrior-AllItems-TheTwinBladesofAzzinoth"
  value: {
-  dps: 1726.9209
-  tps: 4915.12397
+  dps: 1587.11208
+  tps: 4536.85146
  }
 }
 dps_results: {
  key: "TestProtectionWarrior-AllItems-ThunderingSkyflareDiamond"
  value: {
-  dps: 2045.38856
-  tps: 5915.33034
+  dps: 1936.94969
+  tps: 5637.71948
  }
 }
 dps_results: {
  key: "TestProtectionWarrior-AllItems-TinyAbominationinaJar-50351"
  value: {
-  dps: 2140.06866
-  tps: 6181.31769
+  dps: 2015.74697
+  tps: 5861.98181
  }
 }
 dps_results: {
  key: "TestProtectionWarrior-AllItems-TinyAbominationinaJar-50706"
  value: {
-  dps: 2157.73203
-  tps: 6224.69841
+  dps: 2032.34619
+  tps: 5897.80265
  }
 }
 dps_results: {
  key: "TestProtectionWarrior-AllItems-TirelessSkyflareDiamond"
  value: {
-  dps: 2027.35122
-  tps: 5865.33473
+  dps: 1895.69557
+  tps: 5516.33979
  }
 }
 dps_results: {
  key: "TestProtectionWarrior-AllItems-TirelessStarflareDiamond"
  value: {
-  dps: 2027.35122
-  tps: 5865.33473
+  dps: 1895.69557
+  tps: 5516.33979
  }
 }
 dps_results: {
  key: "TestProtectionWarrior-AllItems-TrenchantEarthshatterDiamond"
  value: {
-  dps: 2027.35122
-  tps: 5865.33473
+  dps: 1895.69557
+  tps: 5516.33979
  }
 }
 dps_results: {
  key: "TestProtectionWarrior-AllItems-TrenchantEarthsiegeDiamond"
  value: {
-  dps: 2027.35122
-  tps: 5865.33473
+  dps: 1895.69557
+  tps: 5516.33979
  }
 }
 dps_results: {
  key: "TestProtectionWarrior-AllItems-UndeadSlayer'sBlessedArmor"
  value: {
-  dps: 1720.98985
-  tps: 5018.04092
+  dps: 1639.78323
+  tps: 4795.80335
  }
 }
 dps_results: {
  key: "TestProtectionWarrior-AllItems-WingedTalisman-37844"
  value: {
-  dps: 2028.69407
-  tps: 5875.89625
+  dps: 1913.85402
+  tps: 5564.40478
  }
 }
 dps_results: {
  key: "TestProtectionWarrior-AllItems-Wrynn'sBattlegear"
  value: {
-  dps: 2304.63078
-  tps: 6527.62953
+  dps: 2188.07906
+  tps: 6227.79872
  }
 }
 dps_results: {
  key: "TestProtectionWarrior-AllItems-Wrynn'sPlate"
  value: {
-  dps: 1976.36842
-  tps: 5708.52937
+  dps: 1887.0105
+  tps: 5464.42265
  }
 }
 dps_results: {
  key: "TestProtectionWarrior-AllItems-YmirjarLord'sBattlegear"
  value: {
-  dps: 2605.99471
-  tps: 7291.57513
+  dps: 2492.54342
+  tps: 6998.02399
  }
 }
 dps_results: {
  key: "TestProtectionWarrior-AllItems-YmirjarLord'sPlate"
  value: {
-  dps: 2119.99543
-  tps: 6118.64951
+  dps: 2036.76563
+  tps: 5897.74595
  }
 }
 dps_results: {
  key: "TestProtectionWarrior-Average-Default"
  value: {
-  dps: 3200.83277
-  tps: 8327.9087
-  dtps: 118.71201
+  dps: 3080.11834
+  tps: 8042.8636
+  dtps: 118.62556
  }
 }
 dps_results: {
  key: "TestProtectionWarrior-Settings-Human-P1-Basic-FullBuffs-LongMultiTarget"
  value: {
-  dps: 2078.37588
-  tps: 5568.8801
+  dps: 1962.99932
+  tps: 5283.48468
  }
 }
 dps_results: {
  key: "TestProtectionWarrior-Settings-Human-P1-Basic-FullBuffs-LongSingleTarget"
  value: {
-  dps: 2078.37588
-  tps: 5521.3801
+  dps: 1962.99932
+  tps: 5235.98468
  }
 }
 dps_results: {
  key: "TestProtectionWarrior-Settings-Human-P1-Basic-FullBuffs-ShortSingleTarget"
  value: {
-  dps: 2223.92603
-  tps: 5866.89265
+  dps: 2140.42256
+  tps: 5677.69871
  }
 }
 dps_results: {
  key: "TestProtectionWarrior-Settings-Human-P1-Basic-NoBuffs-LongMultiTarget"
  value: {
-  dps: 1113.62873
-  tps: 2982.79326
+  dps: 1052.91381
+  tps: 2829.59082
  }
 }
 dps_results: {
  key: "TestProtectionWarrior-Settings-Human-P1-Basic-NoBuffs-LongSingleTarget"
  value: {
-  dps: 1113.62873
-  tps: 2935.29326
+  dps: 1052.91381
+  tps: 2782.09082
  }
 }
 dps_results: {
  key: "TestProtectionWarrior-Settings-Human-P1-Basic-NoBuffs-ShortSingleTarget"
  value: {
-  dps: 1030.41932
-  tps: 2740.17121
+  dps: 963.62752
+  tps: 2579.88322
  }
 }
 dps_results: {
  key: "TestProtectionWarrior-Settings-Orc-P1-Basic-FullBuffs-LongMultiTarget"
  value: {
-  dps: 2111.31659
-  tps: 5660.07036
+  dps: 1981.4579
+  tps: 5329.79687
  }
 }
 dps_results: {
  key: "TestProtectionWarrior-Settings-Orc-P1-Basic-FullBuffs-LongSingleTarget"
  value: {
-  dps: 2111.31659
-  tps: 5612.57036
+  dps: 1981.4579
+  tps: 5282.29687
  }
 }
 dps_results: {
  key: "TestProtectionWarrior-Settings-Orc-P1-Basic-FullBuffs-ShortSingleTarget"
  value: {
-  dps: 2305.4128
-  tps: 6076.11763
+  dps: 2151.49499
+  tps: 5696.89427
  }
 }
 dps_results: {
  key: "TestProtectionWarrior-Settings-Orc-P1-Basic-NoBuffs-LongMultiTarget"
  value: {
-  dps: 1122.1823
-  tps: 3013.72926
+  dps: 1058.33558
+  tps: 2844.48078
  }
 }
 dps_results: {
  key: "TestProtectionWarrior-Settings-Orc-P1-Basic-NoBuffs-LongSingleTarget"
  value: {
-  dps: 1122.1823
-  tps: 2966.22926
+  dps: 1058.33558
+  tps: 2796.98078
  }
 }
 dps_results: {
  key: "TestProtectionWarrior-Settings-Orc-P1-Basic-NoBuffs-ShortSingleTarget"
  value: {
-  dps: 1031.56252
-  tps: 2755.91964
+  dps: 989.50031
+  tps: 2645.00796
  }
 }
 dps_results: {
  key: "TestProtectionWarrior-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 3321.93535
-  tps: 8651.26639
-  dtps: 108.29049
+  dps: 3193.3301
+  tps: 8349.51687
+  dtps: 107.84556
  }
 }
diff --git a/sim/warrior/warrior.go b/sim/warrior/warrior.go
index ffcff341e6..ff972a60d9 100644
--- a/sim/warrior/warrior.go
+++ b/sim/warrior/warrior.go
@@ -243,62 +243,62 @@ func (warrior *Warrior) intensifyRageCooldown(baseCd time.Duration) time.Duratio
 func init() {
 	core.BaseStats[core.BaseStatsKey{Race: proto.Race_RaceDraenei, Class: proto.Class_ClassWarrior}] = stats.Stats{
 		stats.Health:      9611,
-		stats.Strength:    185,
+		stats.Strength:    175,
 		stats.Agility:     110,
 		stats.Stamina:     167,
 		stats.Intellect:   37,
 		stats.Spirit:      61,
-		stats.AttackPower: 590,
+		stats.AttackPower: 220,
 		stats.MeleeCrit:   3.188 * core.CritRatingPerCritChance,
 	}
 	core.BaseStats[core.BaseStatsKey{Race: proto.Race_RaceDwarf, Class: proto.Class_ClassWarrior}] = stats.Stats{
 		stats.Health:      9651,
-		stats.Strength:    186,
+		stats.Strength:    179,
 		stats.Agility:     109,
 		stats.Stamina:     171,
 		stats.Intellect:   35,
 		stats.Spirit:      58,
-		stats.AttackPower: 592,
+		stats.AttackPower: 220,
 		stats.MeleeCrit:   3.188 * core.CritRatingPerCritChance,
 	}
 	core.BaseStats[core.BaseStatsKey{Race: proto.Race_RaceGnome, Class: proto.Class_ClassWarrior}] = stats.Stats{
 		stats.Health:      9581,
-		stats.Strength:    175,
+		stats.Strength:    169,
 		stats.Agility:     116,
 		stats.Stamina:     164,
 		stats.Intellect:   42,
 		stats.Spirit:      59,
-		stats.AttackPower: 570,
+		stats.AttackPower: 220,
 		stats.MeleeCrit:   3.188 * core.CritRatingPerCritChance,
 	}
 	core.BaseStats[core.BaseStatsKey{Race: proto.Race_RaceHuman, Class: proto.Class_ClassWarrior}] = stats.Stats{
 		stats.Health:      9621,
-		stats.Strength:    184,
+		stats.Strength:    174,
 		stats.Agility:     113,
 		stats.Stamina:     168,
 		stats.Intellect:   36,
 		stats.Spirit:      63,
-		stats.AttackPower: 588,
+		stats.AttackPower: 220,
 		stats.MeleeCrit:   3.188 * core.CritRatingPerCritChance,
 	}
 	core.BaseStats[core.BaseStatsKey{Race: proto.Race_RaceNightElf, Class: proto.Class_ClassWarrior}] = stats.Stats{
 		stats.Health:      9611,
-		stats.Strength:    181,
+		stats.Strength:    179,
 		stats.Agility:     118,
 		stats.Stamina:     167,
 		stats.Intellect:   36,
 		stats.Spirit:      59,
-		stats.AttackPower: 582,
+		stats.AttackPower: 220,
 		stats.MeleeCrit:   3.188 * core.CritRatingPerCritChance,
 	}
 	core.BaseStats[core.BaseStatsKey{Race: proto.Race_RaceOrc, Class: proto.Class_ClassWarrior}] = stats.Stats{
 		stats.Health:      9641,
-		stats.Strength:    187,
+		stats.Strength:    177,
 		stats.Agility:     110,
 		stats.Stamina:     170,
 		stats.Intellect:   33,
 		stats.Spirit:      62,
-		stats.AttackPower: 594,
+		stats.AttackPower: 220,
 		stats.MeleeCrit:   3.188 * core.CritRatingPerCritChance,
 	}
 	core.BaseStats[core.BaseStatsKey{Race: proto.Race_RaceTauren, Class: proto.Class_ClassWarrior}] = stats.Stats{
@@ -308,17 +308,17 @@ func init() {
 		stats.Stamina:     170,
 		stats.Intellect:   31,
 		stats.Spirit:      61,
-		stats.AttackPower: 578,
+		stats.AttackPower: 220,
 		stats.MeleeCrit:   3.188 * core.CritRatingPerCritChance,
 	}
 	core.BaseStats[core.BaseStatsKey{Race: proto.Race_RaceTroll, Class: proto.Class_ClassWarrior}] = stats.Stats{
 		stats.Health:      9631,
-		stats.Strength:    185,
+		stats.Strength:    175,
 		stats.Agility:     115,
 		stats.Stamina:     169,
 		stats.Intellect:   32,
 		stats.Spirit:      60,
-		stats.AttackPower: 590,
+		stats.AttackPower: 220,
 		stats.MeleeCrit:   3.188 * core.CritRatingPerCritChance,
 	}
 	core.BaseStats[core.BaseStatsKey{Race: proto.Race_RaceUndead, Class: proto.Class_ClassWarrior}] = stats.Stats{
@@ -328,7 +328,7 @@ func init() {
 		stats.Stamina:     160,
 		stats.Intellect:   34,
 		stats.Spirit:      64,
-		stats.AttackPower: 566,
+		stats.AttackPower: 220,
 		stats.MeleeCrit:   3.188 * core.CritRatingPerCritChance,
 	}
 }
diff --git a/ui/core/_shared.scss b/ui/core/_shared.scss
index 6906bce9e5..e9f2e08267 100644
--- a/ui/core/_shared.scss
+++ b/ui/core/_shared.scss
@@ -14,7 +14,6 @@
 	--sidebar-bg-color: DarkKhaki;
 	--sidebar-text-color: White;
 	--sidebar-highlight-color: Blue;
-	--bg-dark-transparent: #1112187d;
 }
 
 .hide {
diff --git a/ui/core/_sim_ui.scss b/ui/core/_sim_ui.scss
index 63b97be80a..51c383947e 100644
--- a/ui/core/_sim_ui.scss
+++ b/ui/core/_sim_ui.scss
@@ -258,3 +258,22 @@ td, th {
 .hide-in-front-of-target .in-front-of-target {
 	display: none !important;
 }
+
+// TODO: Replace with Bootstrap media query once on to node module
+@media only screen and (max-width: 992px) {
+	.sim-header {
+		overflow-x: scroll;
+
+		.sim-tabs {
+			flex-wrap: nowrap;
+
+			.sim-link {
+				white-space: nowrap;
+			}
+		}
+	}
+
+	.known-issues {
+		white-space: nowrap;
+	}
+}
diff --git a/ui/index.html b/ui/index.html
index ee1a0592fd..9ee21ed70c 100644
--- a/ui/index.html
+++ b/ui/index.html
@@ -1,266 +1,275 @@
+<!DOCTYPE html>
 <html>
+	<head>
+		<title>WoWSims - Wrath of the Lich King</title>
+		<meta name="viewport" content="width=device-width, initial-scale=1.0"> 
 
-<head>
-    <title>Wowsims</title>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0"> 
-    <script src="./index.ts" type="module"></script>
-    <link rel="icon" type="image/x-icon" href="/wotlk/assets/favicon_io/favicon.ico">
-    <style>
-        a {
-            text-decoration: none;
-        }
+		<link rel="icon" href="/wotlk/assets/favicon_io/favicon.ico" type="image/x-icon">
+		<link rel="stylesheet" href="./index.scss">
+		<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.0.0/css/all.min.css" integrity="sha512-9usAa10IRO0HhonpyAIVpjrylPvoDwiPUiKdWk5t3PyolY1cOd4DSE0Ga+ri4AuTroPR5aQvXU9xC6qOPnzFeg==" crossorigin="anonymous" referrerpolicy="no-referrer" />
+	</head>
+	<body>
+		<div class="bg-image"></div>
+		<div id="homepage">
+			<header class="homepage-header">
+				<div class="container homepage-header-container">
+					<nav class="navbar navbar-dark navbar-expand-md flex-wrap align-items-end w-100">
+						<div class="navbar-brand-container order-0">
+							<a href="#" class="navbar-brand d-flex align-items-center p-0 m-0">
+								<img class="wowsims-logo" src="/wotlk/assets/img/WoW-Simulator-Icon.png">
+								<h2 class="wowsims-title">WoWSims</h2>
+							</a>
+							<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#homepageHeaderCollapse" aria-controls="homepageHeaderCollapse" aria-expanded="false" aria-label="Toggle navigation">
+								<i class="fa-solid fa-bars fa-2x"></i>
+							</button>
+						</div>
+						<h2 class="wrath-title w-100 order-1 order-md-2">Wrath of the Lich King</h2>
+						<div id="homepageHeaderCollapse" class="collapse navbar-collapse homepage-header-collapse order-2 order-md-1">
+							<div class="navbar-nav">
+								<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#homepageHeaderCollapse" aria-controls="homepageHeaderCollapse" aria-expanded="false" aria-label="Toggle navigation">
+									<i class="fa-solid fa-times fa-2x"></i>
+								</button>
+								<a href="https://discord.gg/p3DgvmnDCS" target="_blank" class="nav-link">
+									<p class="m-0"><i class="discord-link fa fa-brands fa-discord fa-2x"></i>&nbsp;</p>
+								</a>
+								<a href="https://github.com/wowsims/wotlk" target="_blank" class="nav-link">
+									<p class="m-0"><i class="github-link fa fa-brands fa-github fa-2x"></i>&nbsp;</p>
+								</a>
+								<a href="https://patreon.com/wowsims" target="_blank" class="nav-link">
+									<i class="patreon-link fa fa-brands fa-patreon fa-2x me-2"></i>
+									<span class="fs-4 d-md-none d-lg-block">Support our devs</span>
+								</a>
+							</div>
+						</div>
+					</nav>
+				</div>
+			</header>
+			<main>
+				<div class="container homepage-content-container">
+					<div class="info-container">
+						<p class="wowsims-info">
+							Welcome to WoWSims! This is a community-driven project to provide simulations for WotLK Classes & Raids
+							together with the leading theorycrafters and class representatives.
+						</p>
+					</div>
+					<div class="sim-links-container">
+						<div class="sim-links">
+							<a href="/wotlk/raid/" class="sim-link raid-sim-link text-white">
+								<div class="sim-link-content">
+									<img src="/wotlk/assets/img/raid_icon.png" class="sim-link-icon">
+									<span class="sim-link-label">Full Raid Sim</span>
+								</div>
+							</a>
+						</div>
 
-        .content {
-            position: absolute;
-            top: 50px;
-            left: 0;
-            right: 0;
-            margin-left: auto;
-            margin-right: auto;
-            height: 90%;
-            width: 75%;
-            text-align: center;
-        }
+						<div class="sim-links">
+							<div class="dropend sim-link-dropdown">
+								<a href="javascript:void(0)" class="sim-link text-warrior" role="button" data-bs-toggle="dropdown" data-bs-offset="0,0" aria-expanded="false">
+									<div class="sim-link-content">
+										<img src="/wotlk/assets/img/warrior_icon.png" class="sim-link-icon">
+										<span class="sim-link-label">Warrior</span>
+									</div>
+								</a>
+								<ul class="dropdown-menu w-100">
+									<li>
+										<a href="/wotlk/warrior/" class="sim-link text-warrior">
+											<div class="sim-link-content">
+												<img src="/wotlk/assets/img/warrior_icon.png" class="sim-link-icon">
+												<span class="sim-link-label">DPS</span>
+											</div>
+										</a>
+									</li>
+									<li>
+										<a href="/wotlk/protection_warrior/" class="sim-link text-warrior">
+											<div class="sim-link-content">
+												<img src="/wotlk/assets/img/protection_warrior_icon.png" class="sim-link-icon">
+												<span class="sim-link-label">Protection</span>
+											</div>
+										</a>
+									</li>
+								</ul>
+							</div>
+							<div class="dropend sim-link-dropdown">
+								<a href="javascript:void(0)" class="sim-link text-paladin" role="button" data-bs-toggle="dropdown" data-bs-offset="0,0" aria-expanded="false">
+									<div class="sim-link-content">
+										<img src="/wotlk/assets/img/paladin_icon.png" class="sim-link-icon">
+										<span class="sim-link-label">Paladin</span>
+									</div>
+								</a>
+								<ul class="dropdown-menu w-100">
+									<li>
+										<a href="/wotlk/protection_paladin/" class="sim-link text-paladin">
+											<div class="sim-link-content">
+												<img src="/wotlk/assets/img/protection_paladin_icon.png" class="sim-link-icon">
+												<span class="sim-link-label">Protection</span>
+											</div>
+										</a>
+									</li>
+									<li>
+										<a href="/wotlk/retribution_paladin/" class="sim-link text-paladin">
+											<div class="sim-link-content">
+												<img src="/wotlk/assets/img/retribution_icon.png" class="sim-link-icon">
+												<span class="sim-link-label">Retribution</span>
+											</div>
+										</a>
+									</li>
+								</ul>
+							</div>
+							<a href="/wotlk/hunter/" class="sim-link text-hunter">
+								<div class="sim-link-content">
+									<img src="/wotlk/assets/img/hunter_icon.png" class="sim-link-icon">
+									<span class="sim-link-label">Hunter</span>
+								</div>
+							</a>
+							<a href="/wotlk/rogue/" class="sim-link text-rogue">
+								<div class="sim-link-content">
+									<img src="/wotlk/assets/img/rogue_icon.png" class="sim-link-icon">
+									<span class="sim-link-label">Rogue</span>
+								</div>
+							</a>
+							<div class="dropend sim-link-dropdown">
+								<a href="javascript:void(0)" class="sim-link text-priest" role="button" data-bs-toggle="dropdown" data-bs-offset="0,0" aria-expanded="false">
+									<div class="sim-link-content">
+										<img src="/wotlk/assets/img/priest_icon.png" class="sim-link-icon">
+										<span class="sim-link-label">Priest</span>
+									</div>
+								</a>
+								<ul class="dropdown-menu w-100">
+									<li>
+										<a href="/wotlk/shadow_priest/" class="sim-link text-priest">
+											<div class="sim-link-content">
+												<img src="/wotlk/assets/img/shadow_priest_icon.png" class="sim-link-icon">
+												<span class="sim-link-label">Shadow</span>
+											</div>
+										</a>
+									</li>
+									<li>
+										<a href="/wotlk/smite_priest/" class="sim-link text-priest">
+											<div class="sim-link-content">
+												<img src="/wotlk/assets/img/smite_priest_icon.png" class="sim-link-icon">
+												<span class="sim-link-label">Smite</span>
+											</div>
+										</a>
+									</li>
+								</ul>
+							</div>
 
-        .dropdown-option:hover {
-            background-color: rgba(255, 255, 255, 0.3) !important; 
-        }
+							<div class="dropend sim-link-dropdown">
+								<a href="javascript:void(0)" class="sim-link text-death-knight" role="button" data-bs-toggle="dropdown" data-bs-offset="0,0" aria-expanded="false">
+									<div class="sim-link-content">
+										<img src="/wotlk/assets/img/death_knight_icon.png" class="sim-link-icon">
+										<span class="sim-link-label">Death Knight</span>
+									</div>
+								</a>
+								<ul class="dropdown-menu w-100">
+									<li>
+										<a href="/wotlk/deathknight/" class="sim-link text-death-knight">
+											<div class="sim-link-content">
+												<img src="/wotlk/assets/img/death_knight_icon.png" class="sim-link-icon">
+												<span class="sim-link-label">DPS</span>
+											</div>
+										</a>
+									</li>
+									<li>
+										<a href="/wotlk/tank_deathknight/" class="sim-link text-death-knight">
+											<div class="sim-link-content">
+												<img src="/wotlk/assets/img/death_knight_icon.png" class="sim-link-icon">
+												<span class="sim-link-label">Tank</span>
+											</div>
+										</a>
+									</li>
+								</ul>
+							</div>
 
-        .dropdown-option {
-            flex: 0;
-            display: flex;
-            align-items: center;
-            cursor: pointer;
-            background-color: rgba(255, 255, 255, 0.1);
-            height: clamp(25px, 5px + 4.6vh, 60px);
-            padding-left: 6px;
-            padding-right: 6px;
-            white-space: nowrap;
-        }
+							<div class="dropend sim-link-dropdown">
+								<a href="javascript:void(0)" class="sim-link text-shaman" role="button" data-bs-toggle="dropdown" data-bs-offset="0,0" aria-expanded="false">
+									<div class="sim-link-content">
+										<img src="/wotlk/assets/img/shaman_icon.png" class="sim-link-icon">
+										<span class="sim-link-label">Shaman</span>
+									</div>
+								</a>
+								<ul class="dropdown-menu w-100">
+									<li>
+										<a href="/wotlk/elemental_shaman/" class="sim-link text-shaman">
+											<div class="sim-link-content">
+												<img src="/wotlk/assets/img/elemental_shaman_icon.png" class="sim-link-icon">
+												<span class="sim-link-label">Elemental</span>
+											</div>
+										</a>
+									</li>
+									<li>
+										<a href="/wotlk/enhancement_shaman/" class="sim-link text-shaman">
+											<div class="sim-link-content">
+												<img src="/wotlk/assets/img/enhancement_shaman_icon.png" class="sim-link-icon">
+												<span class="sim-link-label">Enhancement</span>
+											</div>
+										</a>
+									</li>
+								</ul>
+							</div>
 
-        .sim-title-dropdown {
-            display: flex;
-            flex-direction: row;
-            margin: 0 auto;
-            flex-wrap: wrap;
-            justify-content: space-evenly;
-        }
+							<a href="/wotlk/mage/" class="sim-link text-mage">
+								<div class="sim-link-content">
+									<img src="/wotlk/assets/img/mage_icon.png" class="sim-link-icon">
+									<span class="sim-link-label">Mage</span>
+								</div>
+							</a>
 
-        .sim-title-dropdown-option-container {
-            margin-top: 10px;
-            margin-left: 10px;
-        }
+							<a href="/wotlk/warlock/" class="sim-link text-warlock">
+								<div class="sim-link-content">
+									<img src="/wotlk/assets/img/warlock_icon.png" class="sim-link-icon">
+									<span class="sim-link-label">Warlock</span>
+								</div>
+							</a>
 
-        .dropdown-panel .sim-title-spec-label {
-            text-shadow: 0 0 1px black, 0 0 1px black, 0 0 1px black;
-        }
-
-        .sim-title-spec-label {
-            font-size: clamp(0.6rem, -1rem + 4vw, 1rem);
-            font-weight: bold;
-        }
-
-        .sim-title-label {
-            margin: 2px 5px;
-        }
-
-        .sim-title-icon {
-            width: clamp(22px, 4px + 3.4vh, 40px);
-        }
-
-        @font-face {
-            font-family: SimDefaultFont;
-            src: url(/wotlk/assets/fonts/PlusJakartaSans-Regular.woff2);
-        }
-
-        @font-face {
-            font-family: SimDefaultFont;
-            src: url(/wotlk/assets/fonts/PlusJakartaSans-Bold.woff2);
-            font-weight: bold;
-        }
-
-        * {
-            font-family: SimDefaultFont;
-            letter-spacing: 1px;
-        }
-
-        .bg-image {
-            background-image: url("assets/img/wotlk.jpg");
-            /* filter: brightness(20%) blur(2px); */
-            height: 100%;
-            background-position: center;
-            background-repeat: no-repeat;
-            background-size: cover;
-        }
-
-        .info h2 {
-            font-size: clamp(2rem, -0.8rem + 7vw, 3.5rem);
-            color: #e0a335;
-        }
-        .info p {
-            font-size: clamp(0.8rem, -1rem + 4vw, 1.5rem);
-            color: white;
-        }
-    </style>
-</head>
-
-<body style="background-color: black">
-    <div class="bg-image"></div>
-    <div class="content">
-        <img src="/wotlk/assets/img/WoW-Simulator-Icon.png" style="height: 75px;">
-        <div class="info">
-            <h2>WoW WotLK Sims</h2>
-            <p>Welcome to WoWSims. This is a community-driven project to provide simulations for WotLK Classes & Raids
-                together with the leading theorycrafters and class representatives.</p>
-        </div>
-        <hr style="width: 50%">
-        <div class="dropdown-panel sim-title-dropdown within-raid-sim-hide">
-            <a href="/wotlk/raid/" class="sim-title-dropdown-option-container" style="flex-basis:100%; color:white">
-                <div class="sim-title-option dropdown-option" style="background-color: rgba(0, 0, 0, 0.5); justify-content: center;">
-                    <img src="/wotlk/assets/img/raid_icon.png" class="sim-title-icon">
-                    <div class="sim-title-label-container">
-                        <span class="sim-title-spec-label sim-title-label">RAID</span>
-                    </div>
-                </div>
-            </a>
-            <a href="/wotlk/balance_druid/" class="sim-title-dropdown-option-container" style="color: rgb(255, 125, 10);">
-                <div class="sim-title-option dropdown-option">
-                    <img src="/wotlk/assets/img/balance_druid_icon.png" class="sim-title-icon">
-                    <div class="sim-title-label-container">
-                        <span class="sim-title-spec-label sim-title-label">BALANCE DRUID</span>
-                    </div>
-                </div>
-            </a>
-            <a href="/wotlk/feral_druid/" class="sim-title-dropdown-option-container" style="color: rgb(255, 125, 10);">
-                <div class="sim-title-option dropdown-option">
-                    <img src="/wotlk/assets/img/feral_druid_icon.png" class="sim-title-icon">
-                    <div class="sim-title-label-container">
-                        <span class="sim-title-spec-label sim-title-label">FERAL DRUID</span>
-                    </div>
-                </div>
-            </a>
-            <a href="/wotlk/feral_tank_druid/" class="sim-title-dropdown-option-container" style="color: rgb(255, 125, 10);">
-                <div class="sim-title-option dropdown-option">
-                    <img src="/wotlk/assets/img/feral_druid_tank_icon.png" class="sim-title-icon">
-                    <div class="sim-title-label-container">
-                        <span class="sim-title-spec-label sim-title-label">FERAL TANK DRUID</span>
-                    </div>
-                </div>
-            </a>
-            <a href="/wotlk/hunter/" class="sim-title-dropdown-option-container" style="color: rgb(171, 212, 115);">
-                <div class="sim-title-option dropdown-option">
-                    <img src="/wotlk/assets/img/hunter_icon.png" class="sim-title-icon">
-                    <div class="sim-title-label-container">
-                        <span class="sim-title-spec-label sim-title-label">HUNTER</span>
-                    </div>
-                </div>
-            </a>
-            <a href="/wotlk/mage/" class="sim-title-dropdown-option-container" style="color: rgb(105, 204, 240);">
-                <div class="sim-title-option dropdown-option">
-                    <img src="/wotlk/assets/img/mage_icon.png" class="sim-title-icon">
-                    <div class="sim-title-label-container">
-                        <span class="sim-title-spec-label sim-title-label">MAGE</span>
-                    </div>
-                </div>
-            </a>
-            <a href="/wotlk/retribution_paladin/" class="sim-title-dropdown-option-container" style="color: rgb(245, 140, 186);">
-                <div class="sim-title-option dropdown-option">
-                    <img src="/wotlk/assets/img/retribution_icon.png" class="sim-title-icon">
-                    <div class="sim-title-label-container">
-                        <span class="sim-title-spec-label sim-title-label">RETRIBUTION PALADIN</span>
-                    </div>
-                </div>
-            </a>
-            <a href="/wotlk/protection_paladin/" class="sim-title-dropdown-option-container" style="color: rgb(245, 140, 186);">
-                <div class="sim-title-option dropdown-option">
-                    <img src="/wotlk/assets/img/protection_paladin_icon.png" class="sim-title-icon">
-                    <div class="sim-title-label-container">
-                        <span class="sim-title-spec-label sim-title-label">PROTECTION PALADIN</span>
-                    </div>
-                </div>
-            </a>
-            <a href="/wotlk/shadow_priest/" class="sim-title-dropdown-option-container" style="color: rgb(255, 255, 255);">
-                <div class="sim-title-option dropdown-option">
-                    <img src="/wotlk/assets/img/shadow_priest_icon.png" class="sim-title-icon">
-                    <div class="sim-title-label-container">
-                        <span class="sim-title-spec-label sim-title-label">SHADOW PRIEST</span>
-                    </div>
-                </div>
-            </a>
-            <a href="/wotlk/smite_priest/" class="sim-title-dropdown-option-container" style="color: rgb(255, 255, 255);">
-                <div class="sim-title-option dropdown-option">
-                    <img src="/wotlk/assets/img/smite_priest_icon.png" class="sim-title-icon">
-                    <div class="sim-title-label-container">
-                        <span class="sim-title-spec-label sim-title-label">SMITE PRIEST</span>
-                    </div>
-                </div>
-            </a>
-            <a href="/wotlk/rogue/" class="sim-title-dropdown-option-container" style="color: rgb(255, 245, 105);">
-                <div class="sim-title-option dropdown-option">
-                    <img src="/wotlk/assets/img/rogue_icon.png" class="sim-title-icon">
-                    <div class="sim-title-label-container">
-                        <span class="sim-title-spec-label sim-title-label">ROGUE</span>
-                    </div>
-                </div>
-            </a>
-            <a href="/wotlk/elemental_shaman/" class="sim-title-dropdown-option-container" style="color: rgb(36, 89, 255);">
-                <div class="sim-title-option dropdown-option">
-                    <img src="/wotlk/assets/img/elemental_shaman_icon.png" class="sim-title-icon">
-                    <div class="sim-title-label-container">
-                        <span class="sim-title-spec-label sim-title-label">ELEMENTAL SHAMAN</span>
-                    </div>
-                </div>
-            </a>
-            <a href="/wotlk/enhancement_shaman/" class="sim-title-dropdown-option-container" style="color: rgb(36, 89, 255);">
-                <div class="sim-title-option dropdown-option">
-                    <img src="/wotlk/assets/img/enhancement_shaman_icon.png" class="sim-title-icon">
-                    <div class="sim-title-label-container">
-                        <span class="sim-title-spec-label sim-title-label">ENHANCEMENT SHAMAN</span>
-                    </div>
-                </div>
-            </a>
-            <a href="/wotlk/warlock/" class="sim-title-dropdown-option-container" style="color: rgb(148, 130, 201);">
-                <div class="sim-title-option dropdown-option">
-                    <img src="/wotlk/assets/img/warlock_icon.png" class="sim-title-icon">
-                    <div class="sim-title-label-container">
-                        <span class="sim-title-spec-label sim-title-label">WARLOCK</span>
-                    </div>
-                </div>
-            </a>
-            <a href="/wotlk/warrior/" class="sim-title-dropdown-option-container" style="color: rgb(199, 156, 110);">
-                <div class="sim-title-option dropdown-option">
-                    <img src="/wotlk/assets/img/warrior_icon.png" class="sim-title-icon">
-                    <div class="sim-title-label-container">
-                        <span class="sim-title-spec-label sim-title-label">WARRIOR</span>
-                    </div>
-                </div>
-            </a>
-            <a href="/wotlk/protection_warrior/" class="sim-title-dropdown-option-container" style="color: rgb(199, 156, 110);">
-                <div class="sim-title-option dropdown-option">
-                    <img src="/wotlk/assets/img/protection_warrior_icon.png" class="sim-title-icon">
-                    <div class="sim-title-label-container">
-                        <span class="sim-title-spec-label sim-title-label">PROTECTION WARRIOR</span>
-                    </div>
-                </div>
-            </a>
-            <a href="/wotlk/deathknight/" class="sim-title-dropdown-option-container" style="color: rgb(194, 46, 70);">
-                <div class="sim-title-option dropdown-option">
-                    <img src="/wotlk/assets/img/death_knight_icon.png" class="sim-title-icon">
-                    <div class="sim-title-label-container">
-                        <span class="sim-title-spec-label sim-title-label">DEATH KNIGHT</span>
-                    </div>
-                </div>
-            </a>
-            <a href="/wotlk/tank_deathknight/" class="sim-title-dropdown-option-container" style="color: rgb(194, 46, 70);">
-                <div class="sim-title-option dropdown-option">
-                    <img src="/wotlk/assets/img/death_knight_icon.png" class="sim-title-icon">
-                    <div class="sim-title-label-container">
-                        <span class="sim-title-spec-label sim-title-label">DEATH KNIGHT TANK</span>
-                    </div>
-                </div>
-            </a>
-        </div>
+							<div class="dropend sim-link-dropdown">
+								<a href="javascript:void(0)" class="sim-link text-druid" role="button" data-bs-toggle="dropdown" data-bs-offset="0,0" aria-expanded="false">
+									<div class="sim-link-content">
+										<img src="/wotlk/assets/img/druid_icon.png" class="sim-link-icon">
+										<div>
+										</div>
+										<span class="sim-link-label">Druid</span>
+									</div>
+								</a>
+								<ul class="dropdown-menu w-100">
+									<li>
+										<a href="/wotlk/balance_druid/" class="sim-link text-druid">
+											<div class="sim-link-content">
+												<img src="/wotlk/assets/img/balance_druid_icon.png" class="sim-link-icon">
+												<span class="sim-link-label">Balance</span>
+											</div>
+										</a>
+									</li>
+									<li>
+										<a href="/wotlk/feral_druid/" class="sim-link text-druid">
+											<div class="sim-link-content">
+												<img src="/wotlk/assets/img/feral_druid_icon.png" class="sim-link-icon">
+												<span class="sim-link-label">Feral DPS</span>
+											</div>
+										</a>
+									</li>
+									<li>
+										<a href="/wotlk/feral_tank_druid/" class="sim-link text-druid">
+											<div class="sim-link-content">
+												<img src="/wotlk/assets/img/feral_druid_tank_icon.png" class="sim-link-icon">
+												<span class="sim-link-label">Feral Tank</span>
+											</div>
+										</a>
+									</li>
+								</ul>
+							</div>
+						</div>
+					</div>
+				</div>
+			</main>
     </div>
-</body>
-
+		<script src="./index.ts" type="module"></script>
+		<script async src="https://www.googletagmanager.com/gtag/js?id=G-T3HBB0LXNX"></script>
+		<script>
+			window.dataLayer = window.dataLayer || [];
+			function gtag(){dataLayer.push(arguments);}
+			gtag('js', new Date());
+			gtag('config', 'G-YEJ8MEHGV2');
+		</script>
+	</body>
 </html>
diff --git a/ui/index.scss b/ui/index.scss
new file mode 100644
index 0000000000..474cc4fac2
--- /dev/null
+++ b/ui/index.scss
@@ -0,0 +1,2 @@
+@import "scss/index";
+@import "scss/homepage";
diff --git a/ui/index.ts b/ui/index.ts
index e69de29bb2..6aeeddb0df 100644
--- a/ui/index.ts
+++ b/ui/index.ts
@@ -0,0 +1,28 @@
+import * as Popper from '@popperjs/core';
+import * as bootstrap from 'bootstrap';
+
+declare global {
+  interface Window {
+    Popper: any;
+    bootstrap: any;
+  }
+}
+
+window.Popper = Popper;
+window.bootstrap = bootstrap;
+
+import './shared/bootstrap_overrides';
+
+function docReady(fn: any) {
+  // see if DOM is already available
+  if (document.readyState === "complete" || document.readyState === "interactive") {
+      // call on next available tick
+      setTimeout(fn, 1);
+  } else {
+      document.addEventListener("DOMContentLoaded", fn);
+  }
+}
+
+docReady(function() {
+  document.getElementsByTagName('body')[0].classList.add('ready');
+});
diff --git a/ui/scss/bootstrap_style_overrides.scss b/ui/scss/bootstrap_style_overrides.scss
new file mode 100644
index 0000000000..84e6df9246
--- /dev/null
+++ b/ui/scss/bootstrap_style_overrides.scss
@@ -0,0 +1,82 @@
+@use "sass:map";
+
+@font-face {
+	font-family: SimDefaultFont;
+	src: url(/wotlk/assets/fonts/PlusJakartaSans-Regular.woff2);
+}
+
+@font-face {
+	font-family: SimDefaultFont;
+	src: url(/wotlk/assets/fonts/PlusJakartaSans-Bold.woff2);
+	font-weight: bold;
+}
+
+:root {
+  --bs-body-bg: black;
+  --bs-body-color: white;
+  --bs-body-font-family: SimDefaultFont;
+  --bs-body-line-height: 1.25;
+  --bs-primary: #e0a335;
+  --bs-primary-rgb: 224,163,53;
+}
+
+.container {
+  height: 100%;
+  display: flex;
+}
+
+.navbar {
+  .navbar-toggler {
+    border: 0;
+    box-shadow: none;
+    color: white;
+  }
+
+  .nav-link {
+    display: flex;
+    align-items: center;
+  }
+}
+
+@include media-breakpoint-down(lg) {
+  .container {
+    width: 100%;
+    max-width: 100%;
+    margin-left: 0;
+    margin-right: 0;
+  }
+}
+
+@include media-breakpoint-down(md) {
+  .navbar {
+    .navbar-collapse {
+      position: fixed;
+      top: 0;
+      bottom: 0;
+      left: 0;
+      right: 0;
+      padding: 1rem;
+      background: rgba(0,0,0,.9);
+      z-index: 1000;
+  
+      .navbar-nav {
+        position: relative;
+        align-items: flex-start;
+
+        .navbar-toggler {
+          position: absolute;
+          top: 0;
+          right: 0;
+        }
+
+        .nav-link {
+          padding-bottom: map.get($spacers, 3);
+
+          &:first-of-type {
+            padding-top: map.get($spacers, 2);
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/ui/scss/bootstrap_theme_overrides.scss b/ui/scss/bootstrap_theme_overrides.scss
new file mode 100644
index 0000000000..cb35efaeca
--- /dev/null
+++ b/ui/scss/bootstrap_theme_overrides.scss
@@ -0,0 +1,34 @@
+$death-knight: rgb(194, 46, 70);
+$druid:        rgb(255, 125, 10);
+$hunter:       rgb(171, 212, 115);
+$mage:         rgb(105, 204, 240);
+$paladin:      rgb(245, 140, 186);
+$priest:       rgb(255, 255, 255);
+$rogue:        rgb(255, 245, 105);
+$shaman:       rgb(36, 89, 255);
+$warlock:      rgb(148, 130, 201);
+$warrior:      rgb(199, 156, 110);
+
+$custom-colors: (
+  "death-knight": $death-knight,
+  "druid":        $druid,
+  "hunter":       $hunter,
+  "mage":         $mage,
+  "paladin":      $paladin,
+  "priest":       $priest,
+  "rogue":        $rogue,
+  "shaman":       $shaman,
+  "warlock":      $warlock,
+  "warrior":      $warrior
+);
+
+$theme-colors: map-merge($theme-colors, $custom-colors);
+
+$enable-negative-margins: true;
+
+$dropdown-bg: black;
+$dropdown-border-radius: 0;
+$dropdown-color: white;
+$dropdown-padding-y: 0;
+
+$navbar-padding-y: 0;
diff --git a/ui/scss/global.scss b/ui/scss/global.scss
new file mode 100644
index 0000000000..b70eec6ae2
--- /dev/null
+++ b/ui/scss/global.scss
@@ -0,0 +1,43 @@
+:root {
+  --color-wrath-blue: #7FCBD8;
+}
+
+* {
+  letter-spacing: 1px;
+}
+
+body {
+  height: 100%;
+  opacity: 0;
+  transition: opacity .25s linear;
+
+  &.ready {
+    opacity: 1;
+  }
+}
+
+a {
+  color: white;
+  text-decoration: none;
+  outline: none;
+
+  &:hover, &:focus, &.active {
+    color: var(--bs-primary);
+  }
+}
+
+hr {
+  border-top: 1px solid;
+  border-bottom: 1px solid;
+}
+
+.bg-image {
+  position: fixed;
+  width: 100%;
+  height: 100%;
+  background-image: url("/wotlk/assets/img/wotlk.jpg");
+  background-position: center;
+  background-repeat: no-repeat;
+  background-size: cover;
+  z-index: -1;
+}
diff --git a/ui/scss/homepage.scss b/ui/scss/homepage.scss
new file mode 100644
index 0000000000..b97fa67818
--- /dev/null
+++ b/ui/scss/homepage.scss
@@ -0,0 +1,206 @@
+@use "sass:map";
+
+#homepage {
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+
+  .homepage-header-container,
+  .homepage-content-container,
+  .homepage-footer-container {
+    padding-top: map.get($spacers, 4);
+    padding-bottom: map.get($spacers, 4);
+  }
+
+  .homepage-header {
+    .homepage-header-container {
+      display: flex;
+
+      .navbar-brand-container {
+        display: flex;
+
+        .wowsims-logo {
+          width: 75px;
+          margin-right: map.get($spacers, 3);
+        }
+  
+        .wowsims-title {
+          @extend .display-1;
+          @extend .fw-bold;
+          color: var(--bs-primary);
+          @extend .text-primary;
+          margin: 0;
+        }
+      }
+
+      .homepage-header-collapse {
+        padding-top: map.get($spacers, 3);
+        padding-bottom: map.get($spacers, 3);
+        align-items: flex-end;
+        justify-content: flex-end;
+      }
+    }
+
+    .wrath-title {
+      @extend .fw-bold;
+      color: var(--color-wrath-blue);
+      margin: 0;
+    }
+  }
+
+  .homepage-content-container {
+    flex-direction: column;
+
+    .info-container {
+      margin-bottom: map.get($spacers, 5);
+      display: flex;
+      flex-direction: column;
+
+      .wowsims-info {
+        @extend .fs-4;
+        width: 75%;
+        margin: 0;
+      }
+    }
+
+    .sim-links-container {
+      display: flex;
+      flex-direction: column;
+
+      .sim-links {
+        display: flex;
+        flex-wrap: wrap;
+
+        &:not(:last-child) {
+          margin-bottom: map.get($spacers, 5);
+        }
+
+        &> .sim-link, &> .sim-link-dropdown {
+          flex: 1 25%;
+          margin-right: 25%;
+        }
+
+        .sim-link {
+          display: flex;
+
+          &:hover, &.show {
+            background-color: rgba(0,0,0,0.5);
+          }
+
+          &.raid-sim-link {
+            flex-grow: 0;
+          }
+
+          .sim-link-content {
+            padding: map.get($spacers, 2);
+            display: flex;
+            align-items: center;
+
+            .sim-link-icon {
+              padding-right: map.get($spacers, 2);
+              width: 64px;
+            }
+
+            .sim-link-label {
+              @extend .fw-bold;
+              @extend .fs-3;
+            }
+          }
+        }
+
+        .sim-link-dropdown {
+          .dropdown-menu {
+            background: rgba(0,0,0,.5);
+            border: 0;
+          }
+        }
+      }
+    }
+  }
+}
+
+@include media-breakpoint-down(lg) {
+  #homepage {
+    .homepage-content-container {
+      .info-container {
+        .wowsims-info {
+          width: 100%;
+        }
+      }
+
+      .sim-links-container {
+        margin-left: map.get($spacers, 3) * -1;
+        margin-right: map.get($spacers, 3) * -1;
+
+        .sim-links {
+          margin-bottom: 0 !important;
+
+          .sim-link, .sim-link-dropdown {
+            flex: 1 50%;
+            margin-right: 0 !important;
+          }
+
+          .sim-link-dropdown {
+            .dropdown-menu {
+              position: relative !important;
+              inset: 0 !important;
+              transform: none !important;
+            }
+          }
+        }
+      }
+    }
+  }
+}
+
+@include media-breakpoint-down(md) {
+  #homepage {
+    .homepage-header-container,
+    .homepage-content-container,
+    .homepage-footer-container {
+      padding-top: map.get($spacers, 3);
+      padding-bottom: map.get($spacers, 3);
+    }
+
+    .homepage-header {
+      .homepage-header-container {
+        display: flex;
+  
+        .navbar-brand-container {
+          width: 100%;
+          justify-content: space-between;
+          align-items: flex-end;
+
+          .wowsims-logo {
+            width: 48px;
+          }
+        }
+      }
+    }
+
+    .homepage-content-container {
+      .info-container {
+        margin-bottom: map.get($spacers, 3);
+      }
+
+      .sim-links-container {
+        .sim-links {
+          .sim-link, .sim-link-dropdown {
+            flex: 1 100% !important;
+          }
+
+          .sim-link {
+            .sim-link-content {
+              display: flex;
+              align-items: center;
+
+              .sim-link-icon {
+                width: 64px;
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/ui/scss/index.scss b/ui/scss/index.scss
new file mode 100644
index 0000000000..a38174019b
--- /dev/null
+++ b/ui/scss/index.scss
@@ -0,0 +1,31 @@
+// Bootstrap functions & variables
+@import "bootstrap/scss/functions";
+@import "bootstrap/scss/variables";
+
+// Custom Bootstrap theme overrides
+@import "bootstrap_theme_overrides";
+
+// Bootstrap configuration
+@import "bootstrap/scss/maps";
+@import "bootstrap/scss/mixins";
+@import "bootstrap/scss/utilities";
+
+// Bootstrap layout & components
+@import "bootstrap/scss/root";
+@import "bootstrap/scss/reboot";
+@import "bootstrap/scss/type";
+@import "bootstrap/scss/containers";
+@import "bootstrap/scss/grid";
+@import "bootstrap/scss/helpers";
+@import "bootstrap/scss/transitions";
+@import "bootstrap/scss/dropdown";
+@import "bootstrap/scss/navbar";
+
+// Bootstrap Utilities API
+@import "bootstrap/scss/utilities/api";
+
+// custom Bootstrap style overrides
+@import "bootstrap_style_overrides";
+
+// Custom styles
+@import "global";
diff --git a/ui/shared/bootstrap_overrides.ts b/ui/shared/bootstrap_overrides.ts
new file mode 100644
index 0000000000..8fb0f0bac5
--- /dev/null
+++ b/ui/shared/bootstrap_overrides.ts
@@ -0,0 +1,26 @@
+import * as bootstrap from 'bootstrap';
+
+document.querySelectorAll('[data-bs-toggle="dropdown"]').forEach(toggle => {
+  let dropdown = new bootstrap.Dropdown(toggle);
+  let dropdownMenu = toggle.nextElementSibling as HTMLElement;
+
+  toggle.addEventListener('mouseover', event => {
+    dropdown.show();
+  });
+
+  toggle.addEventListener('mouseleave', event => {
+    let e = event as MouseEvent;
+    let target = e.relatedTarget as HTMLElement;
+
+    if (target != dropdownMenu && !target.closest('.dropdown-menu'))
+      dropdown.hide();
+  });
+
+  dropdownMenu.addEventListener('mouseleave', event => {
+    let e = event as MouseEvent;
+    let target = e.relatedTarget as HTMLElement;
+
+    if (target != toggle)
+      dropdown.hide();
+  });
+});