diff --git a/cinder.tw2 b/cinder.tw2
index 0b8e4ba..a3a4cdd 100644
--- a/cinder.tw2
+++ b/cinder.tw2
@@ -598,109 +598,6 @@ cinder_equip.tw2
 </section>
 }
 
-::equipped1 <757,554>
-<img src="equip/stiletto-a.png"> {
-(click: ?equiplink1)[
- (replace: ?equiplink1)[(display: "unequipped1")]
- (replace: ?equipment1)[<img src="equip/row1.png">]
- (set: $hasWeapon -= 2)
- (set: $hasStiletto to 0)
-]}
-
-::unequipped2 <630,679>
-(if: $hasFan is 0)[
-<img src="equip/crossbow.png">{
-(click: ?equiplink2)[
- (replace: ?equiplink2)[(display: "equipped2")]
- (replace: ?equipment2)[<img src="equip/row2-crossbow.png">]
- (set: $hasWeapon += 2)
- (set: $hasGuiGun to 1)
- (replace: ?equiplink2b)[(display: "uneq2")]
-]}
-]
-(else:) [
-<img src="equip/crossbow.png">{
-(click: ?equiplink2)[
- (replace: ?equiplink2)[(display: "equipped2")]
- (replace: ?equipment2)[<img src="equip/row2-crossbow.png">]
- (set: $hasWeapon += 0)
- (set: $hasGuiGun to 1)
- (replace: ?equiplink2b)[(display: "uneq2")]
- (set: $hasFan to 0)
-]}
-]
-
-::equipped2 <755,679>
-<img src="equip/crossbow-a.png">{
-(click: ?equiplink2)[
- (replace: ?equiplink2)[(display: "unequipped2")]
- (replace: ?equipment2)[<img src="equip/row2.png">]
- (set: $hasWeapon -= 2)
-]}
-
-::unequipped3 <630,804>
-(if: $hasBomb is 0)[
-<img src="equip/rifle.png">{
-(click: ?equiplink3)[
- (replace: ?equiplink3)[(display: "equipped3")]
- (replace: ?equipment3)[<img src="equip/row3-rifle.png">]
- (set: $hasWeapon += 2)
- (set: $hasRifle to 1)
- (replace: ?equiplink3b)[(display: "uneq3")]
-]}
-]
-(else:) [
-<img src="equip/rifle.png">{
-(click: ?equiplink3)[
- (replace: ?equiplink3)[(display: "equipped3")]
- (replace: ?equipment3)[<img src="equip/row3-rifle.png">]
- (set: $hasWeapon += 0)
- (set: $hasRifle to 1)
- (replace: ?equiplink3b)[(display: "uneq3")]
- (set: $hasBomb to 0)
-]}
-]
-
-::unequipped4 <631,929>
-(if: $hasCanon is 0)[
-<img src="equip/razor.png">{
-(click: ?equiplink4)[
- (replace: ?equiplink4)[(display: "equipped4")]
- (replace: ?equipment4)[<img src="equip/row4-razor.png">]
- (set: $hasWeapon += 1)
- (set: $hasRazor to 1)
- (replace: ?equiplink4b)[(display: "uneq4")]
-]}
-]
-(else:) [
-<img src="equip/razor.png">{
-(click: ?equiplink4)[
- (replace: ?equiplink4)[(display: "equipped4")]
- (replace: ?equipment4)[<img src="equip/row4-razor.png">]
- (set: $hasWeapon -= 1)
- (set: $hasRazor to 1)
- (replace: ?equiplink4b)[(display: "uneq4")]
- (set: $hasCanon to 0)
-]}
-]
-
-::equipped4 <756,929>
-<img src="equip/razor-a.png">{
-(click: ?equiplink4)[
- (replace: ?equiplink4)[(display: "unequipped4")]
- (replace: ?equipment4)[<img src="equip/row4.png">]
- (set: $hasWeapon -= 1)
- (set: $hasRazor to 0)
-]}
-
-::equipped3 <755,804>
-<img src="equip/rifle-a.png">{
-(click: ?equiplink3)[
- (replace: ?equiplink3)[(display: "unequipped3")]
- (replace: ?equipment3)[<img src="equip/row3.png">]
- (set: $hasWeapon -= 2)
-]}
-
 ::into-room [map] <1495.0006999999998,1606>
 {
 <section class="scene s-dark">
diff --git a/cinder_css.tw2 b/cinder_css.tw2
index acfee89..4cf9da7 100644
--- a/cinder_css.tw2
+++ b/cinder_css.tw2
@@ -56,24 +56,20 @@ div.sect-img img{
 /* Equip layout */
 #equipmenu {
     white-space: normal;
-	  display: table;
+	  display: flex;
+    flex-flow: row wrap;
+    width: 100%;
 }/*tw-passage has pre-wrap as its setting, creates whitespace*/
 
 .row {
 	display: table-row; 
 	width: 100%;
 }
-div.col400 {
-    font-size: 0;
-    line-height: 0;
-    display: table-cell;
+.col400 {
+    flex: 1 auto;
 }
 .col240 {
-	line-height: 0;
-    font-size: 0;
-    display: table-cell;
-    margin: 0; /*does nothing*/
-    padding: 0; /*does nothing*/
+    flex: 1 240px;
 }
 .row tw-link, .row .link, .row .enchantment-link {
 	margin: 0;
@@ -299,7 +295,7 @@ tw-passage{
 
 tw-passage img {
     max-width: 640px;
-		width: 100%;
+    /* max-width: 100%; */
 }
 tw-sidebar {
     display: none;
diff --git a/cinder_equip.tw2 b/cinder_equip.tw2
index 1e31000..ced2326 100644
--- a/cinder_equip.tw2
+++ b/cinder_equip.tw2
@@ -22,7 +22,7 @@
 
 ::unequipped1 <630,554>
 (if: $hasCrowbar is 0)[
-<img src="equip/stiletto.png"> {
+<img src="equip/stiletto.png">{
 (click: ?equiplink1)[
  (replace: ?equiplink1)[(display: "equipped1")]
  (replace: ?equipment1)[<img src="equip/row1-stiletto.png">]
@@ -162,3 +162,106 @@
 (set: $hasRazor to 0)
 ]}]
 
+::equipped1 <757,554>
+<img src="equip/stiletto-a.png"> {
+(click: ?equiplink1)[
+ (replace: ?equiplink1)[(display: "unequipped1")]
+ (replace: ?equipment1)[<img src="equip/row1.png">]
+ (set: $hasWeapon -= 2)
+ (set: $hasStiletto to 0)
+]}
+
+::unequipped2 <630,679>
+(if: $hasFan is 0)[
+<img src="equip/crossbow.png">{
+(click: ?equiplink2)[
+ (replace: ?equiplink2)[(display: "equipped2")]
+ (replace: ?equipment2)[<img src="equip/row2-crossbow.png">]
+ (set: $hasWeapon += 2)
+ (set: $hasGuiGun to 1)
+ (replace: ?equiplink2b)[(display: "uneq2")]
+]}
+]
+(else:) [
+<img src="equip/crossbow.png">{
+(click: ?equiplink2)[
+ (replace: ?equiplink2)[(display: "equipped2")]
+ (replace: ?equipment2)[<img src="equip/row2-crossbow.png">]
+ (set: $hasWeapon += 0)
+ (set: $hasGuiGun to 1)
+ (replace: ?equiplink2b)[(display: "uneq2")]
+ (set: $hasFan to 0)
+]}
+]
+
+::equipped2 <755,679>
+<img src="equip/crossbow-a.png">{
+(click: ?equiplink2)[
+ (replace: ?equiplink2)[(display: "unequipped2")]
+ (replace: ?equipment2)[<img src="equip/row2.png">]
+ (set: $hasWeapon -= 2)
+]}
+
+::unequipped3 <630,804>
+(if: $hasBomb is 0)[
+<img src="equip/rifle.png">{
+(click: ?equiplink3)[
+ (replace: ?equiplink3)[(display: "equipped3")]
+ (replace: ?equipment3)[<img src="equip/row3-rifle.png">]
+ (set: $hasWeapon += 2)
+ (set: $hasRifle to 1)
+ (replace: ?equiplink3b)[(display: "uneq3")]
+]}
+]
+(else:) [
+<img src="equip/rifle.png">{
+(click: ?equiplink3)[
+ (replace: ?equiplink3)[(display: "equipped3")]
+ (replace: ?equipment3)[<img src="equip/row3-rifle.png">]
+ (set: $hasWeapon += 0)
+ (set: $hasRifle to 1)
+ (replace: ?equiplink3b)[(display: "uneq3")]
+ (set: $hasBomb to 0)
+]}
+]
+
+::unequipped4 <631,929>
+(if: $hasCanon is 0)[
+<img src="equip/razor.png">{
+(click: ?equiplink4)[
+ (replace: ?equiplink4)[(display: "equipped4")]
+ (replace: ?equipment4)[<img src="equip/row4-razor.png">]
+ (set: $hasWeapon += 1)
+ (set: $hasRazor to 1)
+ (replace: ?equiplink4b)[(display: "uneq4")]
+]}
+]
+(else:) [
+<img src="equip/razor.png">{
+(click: ?equiplink4)[
+ (replace: ?equiplink4)[(display: "equipped4")]
+ (replace: ?equipment4)[<img src="equip/row4-razor.png">]
+ (set: $hasWeapon -= 1)
+ (set: $hasRazor to 1)
+ (replace: ?equiplink4b)[(display: "uneq4")]
+ (set: $hasCanon to 0)
+]}
+]
+
+::equipped4 <756,929>
+<img src="equip/razor-a.png">{
+(click: ?equiplink4)[
+ (replace: ?equiplink4)[(display: "unequipped4")]
+ (replace: ?equipment4)[<img src="equip/row4.png">]
+ (set: $hasWeapon -= 1)
+ (set: $hasRazor to 0)
+]}
+
+::equipped3 <755,804>
+<img src="equip/rifle-a.png">{
+(click: ?equiplink3)[
+ (replace: ?equiplink3)[(display: "unequipped3")]
+ (replace: ?equipment3)[<img src="equip/row3.png">]
+ (set: $hasWeapon -= 2)
+]}
+