diff --git a/frontend/core/src/com/gameware/game/GameWare.java b/frontend/core/src/com/gameware/game/GameWare.java
index bf01fdea00d163864468aef36c5a16c9fd668697..7ce711db4e2b5a4ab8e1dc3f976a1c449aea7f27 100644
--- a/frontend/core/src/com/gameware/game/GameWare.java
+++ b/frontend/core/src/com/gameware/game/GameWare.java
@@ -8,6 +8,7 @@ import com.badlogic.gdx.graphics.g2d.SpriteBatch;
 import com.gameware.game.states.GameStateManager;
 import com.gameware.game.states.LoginState;
 import com.gameware.game.states.MenuState;
+import com.gameware.game.states.OptionsState;
 
 public class GameWare extends ApplicationAdapter {
 	private SpriteBatch batch;
@@ -41,7 +42,7 @@ public class GameWare extends ApplicationAdapter {
 		music.setVolume(0.1f);
 		toggleMusic();
 
-		gsm.push(new LoginState(gsm));
+		gsm.push(new OptionsState(gsm));
 	}
 
 	@Override
diff --git a/frontend/core/src/com/gameware/game/states/OptionsState.java b/frontend/core/src/com/gameware/game/states/OptionsState.java
index d3e536a9c18a6bba10ecd98db30906e9d3f66d28..8e144f937e14e9e3aebf394c4ba81b692a8c18cb 100644
--- a/frontend/core/src/com/gameware/game/states/OptionsState.java
+++ b/frontend/core/src/com/gameware/game/states/OptionsState.java
@@ -19,7 +19,7 @@ public class OptionsState extends State {
     private Stage stage;
     private Table table;
 
-    private int spacingOnBottom = Gdx.graphics.getHeight()/15;
+    private int spacingOnBottom = Gdx.graphics.getHeight()/25;
     private float fontScaleX = 3f;
     private float fontScaleY = 3f;
     private String backBtnText = "Back";
@@ -43,7 +43,7 @@ public class OptionsState extends State {
 
         //TODO: Make the functional interfaces work.
         table.row();
-        table.add(makeLabel(musicToggleLabelText,skin));
+        table.add(makeLabel(musicToggleLabelText,skin)).spaceBottom(spacingOnBottom);
         table.add(makeMusicCheckBox(skin, new checkBoxInterface() {
             @Override
             public boolean handle(Event event) {
@@ -54,15 +54,15 @@ public class OptionsState extends State {
 
                 return false;
             }
-        }));
+        })).spaceBottom(spacingOnBottom);
 
         table.row();
-        table.add(makeLabel(soundEffectToggleLabelText,skin));
-        table.add(makeSoundEffectCheckBox(skin));
+        table.add(makeLabel(soundEffectToggleLabelText,skin)).spaceBottom(spacingOnBottom).padRight(50);
+        table.add(makeSoundEffectCheckBox(skin)).spaceBottom(spacingOnBottom);
 
         table.row();
-        table.add(makeLabel(darkModeToggleLabelText,skin));
-        table.add(makeDarkModeCheckBox(skin));
+        table.add(makeLabel(darkModeToggleLabelText,skin)).spaceBottom(spacingOnBottom);
+        table.add(makeDarkModeCheckBox(skin)).spaceBottom(spacingOnBottom);
 
         table.row();
         table.add(makebackBtn(skin));
@@ -123,6 +123,7 @@ public class OptionsState extends State {
         });
         */
         musicToggle.addListener((EventListener) obj);
+        musicToggle.getImage().setScale(2,2);
         return musicToggle;
     }
 
@@ -132,6 +133,7 @@ public class OptionsState extends State {
             @Override
             public void clicked(InputEvent e, float x, float y){ GameWare.toggleSoundEffects(); }
         });
+        soundEffectToggle.getImage().setScale(2,2);
         return soundEffectToggle;
     }
 
@@ -141,6 +143,8 @@ public class OptionsState extends State {
             @Override
             public void clicked(InputEvent e, float x, float y){ GameWare.toggleDarkMode(); }
         });
+
+        darkModeToggle.getImage().setScale(2,2);
         return darkModeToggle;
     }