diff --git a/less/character-sheet.less b/less/character-sheet.less
index 669da15..895778a 100644
--- a/less/character-sheet.less
+++ b/less/character-sheet.less
@@ -546,7 +546,7 @@
     }
 
     .movedescription {
-        font-family: "VT323", Arial, Helvetica, sans-serif;
+        font-family: VT323;
         width: 620px;
         height: 520px;
         margin: 10px;
diff --git a/modules/sheets/pokemonCharacterSheet.js b/modules/sheets/pokemonCharacterSheet.js
index 1f3d1b0..4bc305d 100644
--- a/modules/sheets/pokemonCharacterSheet.js
+++ b/modules/sheets/pokemonCharacterSheet.js
@@ -73,23 +73,33 @@ export default class pokemonCharacterSheet extends api.HandlebarsApplicationMixi
     }
 
     calculateDerivated(context) {
-        context.system.armorClass = 10+context.system.stats.defense
-        context.system.speed = 30+5*context.system.stats.speed
+        context.system.armorClass = 10+context.system.stats.defense;
+        context.system.speed = 30+5*context.system.stats.speed;
 
-        return context
+        return context;
+    }
+
+    /** @override */
+    submit(submitOptions) {
+        console.log("Submit");
+
+        context.system.tab = this.tab;
+
+        return super.submit(submitOptions);
     }
 
     /** @override */
     _onRender(context, options) {
+        this.tab = context.system.tab;
 
         const tabs = new foundry.applications.ux.Tabs({navSelector: ".tabs", contentSelector: ".content", initial: this.tab});
         tabs.bind(this.element);
 
-        console.log(this.tab);
+        console.log("Rendering with "+this.tab+" open");
         tabs.activate(this.tab);
 
         tabs.callback = function(){
-            console.log(tabs.active);
+            console.log("Switching to "+tabs.active);
             this.tab = tabs.active;
         }
 
diff --git a/pokemon.css b/pokemon.css
index 7096142..947c22e 100644
--- a/pokemon.css
+++ b/pokemon.css
@@ -462,7 +462,7 @@
   margin-left: 50px;
 }
 .pokemon.sheet.characterSheet .movedescription {
-  font-family: "VT323", Arial, Helvetica, sans-serif;
+  font-family: VT323;
   width: 620px;
   height: 520px;
   margin: 10px;
diff --git a/system.json b/system.json
index 8943626..6220691 100644
--- a/system.json
+++ b/system.json
@@ -1,5 +1,5 @@
 {
-    "version": "0.0.51",
+    "version": "0.0.52",
     "id": "pokemon",
     "title": "Pokémon TTRPG",
     "description": "A Pokémon TTRPG",
diff --git a/system.zip b/system.zip
index 422482c..d8172c4 100644
Binary files a/system.zip and b/system.zip differ
diff --git a/template.json b/template.json
index 551e8c4..d24260f 100644
--- a/template.json
+++ b/template.json
@@ -6,6 +6,8 @@
         ],
 
         "character": {
+            "tab": "tab1",
+
             "species": "species",
 
             "experience": {