diff --git a/.gitignore b/.gitignore
index dbe5203..bc37c3b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 *.swp
+*.bat
 sets/
diff --git a/index.html b/index.html
index 2bff00d..431a5b4 100644
--- a/index.html
+++ b/index.html
@@ -26,13 +26,16 @@
             <div class="equipment" style="grid-column:1/span 2;grid-row:1">
                 <div style="grid-column:1/span 2;grid-row:1">
                     <table>
-                        <tr>
+                        <tr style="padding-right: 10px">
                             <th class="center title">
                                 <label>Equipment</label>
                             </th>
                             <th class="center title">
                                 <label>Powdering</label>
                             </th>
+                            <th class="center title">
+                                <label>Accessories</label>
+                            </th>
                         </tr>
                         <tr>
                             <td class="left">
@@ -47,6 +50,13 @@
                                 <input class="iteminput" type="text" id="helmet-powder" name="helmet-powder" placeholder="Example: t6t6"/>
                                 <p class="error" style="color: red; top: 30px; font-size: 10px; padding: 0; margin: 0; height: 5px; font-family: 'Nunito', sans-serif; white-space: nowrap;"></p>
                             </td>
+                            <td class="left">
+                                <label for="ring1-choice">Ring 1:</label>
+                                <input class="iteminput" list="ring1-items" id="ring1-choice" name="ring1-choice" placeholder="No Ring 1"/>
+                                <datalist id="ring1-items">
+                                </datalist>
+                                <p class="error" style="color: red; top: 30px; font-size: 10px; padding: 0; margin: 0; height: 5px; font-family: 'Nunito', sans-serif; white-space: nowrap;"></p>
+                            </td>
                         </tr>
                         <tr>
                             <td class="left">
@@ -61,6 +71,13 @@
                                 <input class="iteminput" type="text" id="chestplate-powder" name="chestplate-powder" />
                                 <p class="error" style="color: red; top: 30px; font-size: 10px; padding: 0; margin: 0; height: 5px; font-family: 'Nunito', sans-serif; white-space: nowrap;"></p>
                             </td>
+                            <td class="left">
+                                <label for="ring2-choice">Ring 2:</label>
+                                <input class="iteminput" list="ring2-items" id="ring2-choice" name="ring2-choice" placeholder="No Ring 2" />
+                                <datalist id="ring2-items">
+                                </datalist>
+                                <p class="error" style="color: red; top: 30px; font-size: 10px; padding: 0; margin: 0; height: 5px; font-family: 'Nunito', sans-serif; white-space: nowrap;"></p>
+                            </td>
                         </tr>
                         <tr>
                             <td class="left">
@@ -75,6 +92,13 @@
                                 <input class="iteminput" type="text" id="leggings-powder" name="leggings-powder" />
                                 <p class="error" style="color: red; top: 30px; font-size: 10px; padding: 0; margin: 0; height: 5px; font-family: 'Nunito', sans-serif; white-space: nowrap;"></p>
                             </td>
+                            <td class="left">
+                                <label for="bracelet-choice">Bracelet:</label>
+                                <input class="iteminput" list="bracelet-items" id="bracelet-choice" name="bracelet-choice" placeholder="No Bracelet" />
+                                <datalist id="bracelet-items">
+                                </datalist>
+                                <p class="error" style="color: red; top: 30px; font-size: 10px; padding: 0; margin: 0; height: 5px; font-family: 'Nunito', sans-serif; white-space: nowrap;"></p>
+                            </td>
                         </tr>
                         <tr>
                             <td class="left">
@@ -89,6 +113,13 @@
                                 <input class="iteminput" type="text" id="boots-powder" name="boots-powder" />
                                 <p class="error" style="color: red; top: 30px; font-size: 10px; padding: 0; margin: 0; height: 5px; font-family: 'Nunito', sans-serif; white-space: nowrap;"></p>
                             </td>
+                            <td class="left">
+                                <label for="necklace-choice">Necklace:</label>
+                                <input class="iteminput" list="necklace-items" id="necklace-choice" name="necklace-choice" placeholder="No Necklace"/>
+                                <datalist id="necklace-items">
+                                </datalist>
+                                <p class="error" style="color: red; top: 30px; font-size: 10px; padding: 0; margin: 0; height: 5px; font-family: 'Nunito', sans-serif; white-space: nowrap;"></p>
+                            </td>
                         </tr>
                         <tr>
                             <td class="left">
@@ -105,53 +136,6 @@
                                 <input class="iteminput" type="text" id="weapon-powder" name="weapon-powder" />
                                 <p class="error" style="color: red; top: 30px; font-size: 10px; padding: 0; margin: 0; height: 5px; font-family: 'Nunito', sans-serif; white-space: nowrap;"></p>
                             </td>
-                        </tr>
-                    </table>
-                </div>
-                <div style="grid-column:3/span 1;grid-row:1">
-                    <table>
-                        <tr>
-                            <th class="center title">
-                                <label>Accessories</label>
-                            </th>
-                        </tr>
-                        <tr>
-                            <td class="left">
-                                <label for="ring1-choice">Ring 1:</label>
-                                <input class="iteminput" list="ring1-items" id="ring1-choice" name="ring1-choice" placeholder="No Ring 1"/>
-                                <datalist id="ring1-items">
-                                </datalist>
-                                <p class="error" style="color: red; top: 30px; font-size: 10px; padding: 0; margin: 0; height: 5px; font-family: 'Nunito', sans-serif; white-space: nowrap;"></p>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td class="left">
-                                <label for="ring2-choice">Ring 2:</label>
-                                <input class="iteminput" list="ring2-items" id="ring2-choice" name="ring2-choice" placeholder="No Ring 2" />
-                                <datalist id="ring2-items">
-                                </datalist>
-                                <p class="error" style="color: red; top: 30px; font-size: 10px; padding: 0; margin: 0; height: 5px; font-family: 'Nunito', sans-serif; white-space: nowrap;"></p>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td class="left">
-                                <label for="bracelet-choice">Bracelet:</label>
-                                <input class="iteminput" list="bracelet-items" id="bracelet-choice" name="bracelet-choice" placeholder="No Bracelet" />
-                                <datalist id="bracelet-items">
-                                </datalist>
-                                <p class="error" style="color: red; top: 30px; font-size: 10px; padding: 0; margin: 0; height: 5px; font-family: 'Nunito', sans-serif; white-space: nowrap;"></p>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td class="left">
-                                <label for="necklace-choice">Necklace:</label>
-                                <input class="iteminput" list="necklace-items" id="necklace-choice" name="necklace-choice" placeholder="No Necklace"/>
-                                <datalist id="necklace-items">
-                                </datalist>
-                                <p class="error" style="color: red; top: 30px; font-size: 10px; padding: 0; margin: 0; height: 5px; font-family: 'Nunito', sans-serif; white-space: nowrap;"></p>
-                            </td>
-                        </tr>
-                        <tr>
                             <td class="left">
                                 <br/>
                                 <label for="level-choice">Level:</label>
@@ -190,15 +174,87 @@
                             </td>
                         </tr>
                     </table>
-                </div>
-                <div class="center" style="grid-column:1/span 3;grid-row:3">
                     <br><br>
+                </div>
+                <div class="skillpoints" style="grid-column:1/span 3;grid-row:3;">
+                    <div class="center" style="grid-column:1;grid-row:1">
+                        <div>
+                            <label for="str-skp" class="skpLabel" id="str-skp-label">Strength:</label><br>
+                            <input type="string" id="str-skp" name="str-skp" value="0" class="skpInput"/>
+                        </div>
+                        <div id="str-skp-assign" class="skpDesc">
+                            Manually Assigned: 0
+                        </div>
+                        <div id="str-skp-base" class="skpDesc">
+                            Original Value: 0
+                        </div>
+                        <div id ="str-skp-pct" class="skpDesc">
+                        </div>
+                    </div>
+                    <div class="center" style="grid-column:2;grid-row:1">
+                        <div>
+                            <label for="dex-skp" class="skpLabel" id="dex-skp-label">Dexterity:</label><br>
+                            <input type="string" id="dex-skp" name="dex-skp" value="0" class="skpInput"/>
+                        </div>
+                        <div id="dex-skp-assign" class="skpDesc">
+                            Manually Assigned: 0
+                        </div>
+                        <div id="dex-skp-base" class="skpDesc">
+                            Original Value: 0
+                        </div>
+                        <div id ="dex-skp-pct" class="skpDesc">
+                        </div>
+                    </div>
+                    <div class="center" style="grid-column:3;grid-row:1">
+                        <div>
+                            <label for="int-skp" class="skpLabel" id="int-skp-label">Intelligence:</label><br>
+                            <input type="string" id="int-skp" name="int-skp" value="0" class="skpInput"/>
+                        </div>
+                        <div id="int-skp-assign" class="skpDesc">
+                            Manually Assigned: 0
+                        </div>
+                        <div id="int-skp-base" class="skpDesc">
+                            Original Value: 0
+                        </div>
+                        <div id ="int-skp-pct" class="skpDesc">
+                        </div>
+                    </div>
+                    <div class="center" style="grid-column:4;grid-row:1">
+                        <div>
+                            <label for="def-skp" class="skpLabel" id="def-skp-label">Defense:</label><br>
+                            <input type="string" id="def-skp" name="def-skp" value="0" class="skpInput"/>
+                        </div>
+                        <div id="def-skp-assign" class="skpDesc">
+                            Manually Assigned: 0
+                        </div>
+                        <div id="def-skp-base" class="skpDesc">
+                            Original Value: 0
+                        </div>
+                        <div id ="def-skp-pct" class="skpDesc">
+                        </div>
+                    </div>
+                    <div class="center" style="grid-column:5;grid-row:1">
+                        <div>
+                            <label for="agi-skp" class="skpLabel" id="agi-skp-label">Agility:</label><br>
+                            <input type="string" id="agi-skp" name="agi-skp" value="0" class="skpInput"/>
+                        </div>
+                        <div id="agi-skp-assign" class="skpDesc">
+                            Manually Assigned: 0
+                        </div>
+                        <div id="agi-skp-base" class="skpDesc">
+                            Original Value: 0
+                        </div>
+                        <div id ="agi-skp-pct" class="skpDesc">
+                        </div>
+                    </div>
+                </div>
+                <div class="center" style="grid-column:1/span 3;grid-row:4">
                     <div class="nomargin" id="summary-box">
-                        
+
                     </div>
                     <br><br>
                     <div class="externalBuffs hide-container-block" id="buff-box" style="display: none;">
-                        <table class="externalBuffs">
+                        <table class="externalBuffs" style="padding-bottom:20px">
                             <tr>
                                 <p class = "buffs-title itemp title">
                                     Spell Boosts & Powder Specials:
@@ -412,77 +468,16 @@
                             </div>
                         </div>
                     </div>
-        <div class="skillpoints">
-            <div class="center" style="grid-column:1;grid-row:1">
-                <div>
-                    <label for="str-skp" class="skpLabel" id="str-skp-label">Strength:</label><br>
-                    <input type="string" id="str-skp" name="str-skp" value="0" class="skpInput"/>
-                </div>
-                <div id="str-skp-assign" class="skpDesc">
-                    Manually Assigned: 0
-                </div>
-                <div id="str-skp-base" class="skpDesc">
-                    Original Value: 0
-                </div>
-                <div id ="str-skp-pct" class="skpDesc">
-                </div>
-            </div>
-            <div class="center" style="grid-column:2;grid-row:1">
-                <div>
-                    <label for="dex-skp" class="skpLabel" id="dex-skp-label">Dexterity:</label><br>
-                    <input type="string" id="dex-skp" name="dex-skp" value="0" class="skpInput"/>
-                </div>
-                <div id="dex-skp-assign" class="skpDesc">
-                    Manually Assigned: 0
-                </div>
-                <div id="dex-skp-base" class="skpDesc">
-                    Original Value: 0
-                </div>
-                <div id ="dex-skp-pct" class="skpDesc">
-                </div>
-            </div>
-            <div class="center" style="grid-column:3;grid-row:1">
-                <div>
-                    <label for="int-skp" class="skpLabel" id="int-skp-label">Intelligence:</label><br>
-                    <input type="string" id="int-skp" name="int-skp" value="0" class="skpInput"/>
-                </div>
-                <div id="int-skp-assign" class="skpDesc">
-                    Manually Assigned: 0
-                </div>
-                <div id="int-skp-base" class="skpDesc">
-                    Original Value: 0
-                </div>
-                <div id ="int-skp-pct" class="skpDesc">
-                </div>
-            </div>
-            <div class="center" style="grid-column:4;grid-row:1">
-                <div>
-                    <label for="def-skp" class="skpLabel" id="def-skp-label">Defense:</label><br>
-                    <input type="string" id="def-skp" name="def-skp" value="0" class="skpInput"/>
-                </div>
-                <div id="def-skp-assign" class="skpDesc">
-                    Manually Assigned: 0
-                </div>
-                <div id="def-skp-base" class="skpDesc">
-                    Original Value: 0
-                </div>
-                <div id ="def-skp-pct" class="skpDesc">
-                </div>
-            </div>
-            <div class="center" style="grid-column:5;grid-row:1">
-                <div>
-                    <label for="agi-skp" class="skpLabel" id="agi-skp-label">Agility:</label><br>
-                    <input type="string" id="agi-skp" name="agi-skp" value="0" class="skpInput"/>
-                </div>
-                <div id="agi-skp-assign" class="skpDesc">
-                    Manually Assigned: 0
-                </div>
-                <div id="agi-skp-base" class="skpDesc">
-                    Original Value: 0
-                </div>
-                <div id ="agi-skp-pct" class="skpDesc">
-                </div>
-            </div>
+
+        <div class="center">
+            <br>
+            <button class = "button" id = "update-button" onclick = "updateStats()">
+                Update Stats
+            </button>
+            <button class = "button" id = "show-id-button" onclick = "toggleID()">
+                Edit IDs
+            </button>
+            <br>
         </div>
         <div class="id-box fade-in" id="id-edit" style="display: none">
             <div class="id-edit1">
@@ -879,14 +874,7 @@
             </div>
         </div>
         <br>
-        <div class="center">
-            <button class = "button" id = "update-button" onclick = "updateStats()">
-                Update Stats
-            </button>
-            <button class = "button" id = "show-id-button" onclick = "toggleID()">
-                Edit IDs
-            </button>
-        </div>
+
         <div class="wide-space"></div>
                 </div>
             </div>