diff --git a/src/lib/DisplayData.svelte b/src/lib/DisplayData.svelte
index 4dac690..e56e055 100644
--- a/src/lib/DisplayData.svelte
+++ b/src/lib/DisplayData.svelte
@@ -414,28 +414,28 @@
             <tr>
               <td class="value-column"><b>HP</b></td>
               <td class="atai-column"><b>{pokemonData.hp}</b></td>
-              <td class="atai-column"
-                ><b
-                  ><input
+              <td class="atai-column">
+                <b>
+                  <input
                     class="vd-input"
                     type="number"
                     bind:value={pokemonData.hp_v}
                     min="0"
                     max="31"
-                  /></b
-                ></td
-              >
-              <td class="atai-column"
-                ><b
-                  ><input
+                  />
+                </b>
+              </td>
+              <td class="atai-column">
+                <b>
+                  <input
                     class="vd-input"
                     type="number"
                     bind:value={pokemonData.hp_d}
                     min="0"
                     max="252"
-                  /></b
-                ></td
-              >
+                  />
+                </b>
+              </td>
               <td class="atai-column"><b>{hp_final}</b></td>
               <td class="plus-minus-column"><b>+</b></td>
               <td class="plus-minus-column"><b>-</b></td>
@@ -443,45 +443,45 @@
             <tr>
               <td class="value-column"><b>ATK</b></td>
               <td class="atai-column"><b>{pokemonData.attack}</b></td>
-              <td class="atai-column"
-                ><b
-                  ><input
+              <td class="atai-column">
+                <b>
+                  <input
                     class="vd-input"
                     type="number"
                     bind:value={pokemonData.attack_v}
                     min="0"
                     max="31"
-                  /></b
-                ></td
-              >
-              <td class="atai-column"
-                ><b
-                  ><input
+                  />
+                </b>
+              </td>
+              <td class="atai-column">
+                <b>
+                  <input
                     class="vd-input"
                     type="number"
                     bind:value={pokemonData.attack_d}
                     min="0"
                     max="252"
-                  /></b
-                ></td
-              >
+                  />
+                </b>
+              </td>
               <td class="atai-column"><b>{attack_final}</b></td>
-              <td class="atai-column"
-                ><b
-                  ><input
+              <td class="atai-column">
+                <b>
+                  <input
                     type="checkbox"
                     bind:checked={pokemonData.attack_plus}
-                  /></b
-                ></td
-              >
-              <td class="atai-column"
-                ><b
-                  ><input
+                  />
+                </b>
+              </td>
+              <td class="atai-column">
+                <b>
+                  <input
                     type="checkbox"
                     bind:checked={pokemonData.attack_minus}
-                  /></b
-                ></td
-              >
+                  />
+                </b>
+              </td>
               <td>&nbsp;&nbsp;&nbsp;&nbsp;</td>
               {#each Array.from({ length: 6 }, (_, i) => i - 6) as i}
                 <!-- svelte-ignore a11y-click-events-have-key-events -->
@@ -533,37 +533,37 @@
             <tr>
               <td class="value-column"><b>DEF</b></td>
               <td class="atai-column"><b>{pokemonData.defense}</b></td>
-              <td class="atai-column"
-                ><b
-                  ><input
+              <td class="atai-column">
+                <b>
+                  <input
                     class="vd-input"
                     type="number"
                     bind:value={pokemonData.defense_v}
                     min="0"
                     max="31"
-                  /></b
-                ></td
-              >
-              <td class="atai-column"
-                ><b
-                  ><input
+                  />
+                </b>
+              </td>
+              <td class="atai-column">
+                <b>
+                  <input
                     class="vd-input"
                     type="number"
                     bind:value={pokemonData.defense_d}
                     min="0"
                     max="252"
-                  /></b
-                ></td
-              >
+                  />
+                </b>
+              </td>
               <td class="atai-column"><b>{defense_final}</b></td>
-              <td class="atai-column"
-                ><b
-                  ><input
+              <td class="atai-column">
+                <b>
+                  <input
                     type="checkbox"
                     bind:checked={pokemonData.defense_plus}
-                  /></b
-                ></td
-              >
+                  />
+                </b>
+              </td>
               <td class="atai-column">
                 <b>
                   <input
@@ -910,15 +910,15 @@
             </tr>
             <tr>
               <td class="value-column"><b>Level</b></td>
-              <td class="atai-column"
-                ><input
+              <td class="atai-column">
+                <input
                   class="vd-input"
                   type="number"
                   bind:value={level}
                   min="1"
                   max="100"
-                /></td
-              >
+                />
+              </td>
               <td class="atai-column" />
             </tr>
           </table>
@@ -936,16 +936,16 @@
                   });
                 }}
               >
-                <td
-                  ><img
+                <td>
+                  <img
                     src={learnset.category === 1
                       ? PhysicalIcon
                       : learnset.category === 2
                       ? SpecialIcon
                       : BuffIcon}
                     alt="a"
-                  /></td
-                >
+                  />
+                </td>
                 <td>{@html generate_type(learnset.types)}</td>
                 <td>{learnset.name}</td>
                 <td>{learnset.power}</td>
diff --git a/src/lib/MainWrapper.svelte b/src/lib/MainWrapper.svelte
index 25d0b9d..ff40f0e 100644
--- a/src/lib/MainWrapper.svelte
+++ b/src/lib/MainWrapper.svelte
@@ -126,7 +126,7 @@
   <div class="row-display">
     <div class="pokemon-button-div">
       <table class="button-table">
-        {#each [0, 1, 2, 3, 4, 5] as i}
+        {#each Array.from({ length: 6 }, (_, i) => i) as i}
           <tr>
             <td>
               <!-- svelte-ignore a11y-click-events-have-key-events -->