diff --git a/Main/src/main/java/com/chameleonvision/util/Helpers.java b/Main/src/main/java/com/chameleonvision/util/Helpers.java
index 03d1eca6a..d63db5428 100644
--- a/Main/src/main/java/com/chameleonvision/util/Helpers.java
+++ b/Main/src/main/java/com/chameleonvision/util/Helpers.java
@@ -4,15 +4,22 @@ import edu.wpi.cscore.VideoMode;
 import org.opencv.core.Scalar;
 
 import java.awt.*;
+import java.util.HashMap;
+import java.util.Map;
 
 public class Helpers {
-    private Helpers() {}
+    private Helpers() {
+    }
 
     public static Scalar colorToScalar(Color color) {
         return new Scalar(color.getRed(), color.getGreen(), color.getBlue());
     }
 
-    public static String VideoModeToString(VideoMode videoMode) {
-        return String.format("%dx%d@%dFPS in %s", videoMode.width, videoMode.height, videoMode.fps, videoMode.pixelFormat.toString());
+    public static HashMap VideoModeToHashMap(VideoMode videoMode) {
+        return new HashMap<String, Object>() {{
+                put("width", videoMode.width);
+                put("height", videoMode.height);
+                put("fps", videoMode.fps);
+                put("pixelFormat", videoMode.pixelFormat.toString());}};
     }
 }
diff --git a/Main/src/main/java/com/chameleonvision/vision/VisionManager.java b/Main/src/main/java/com/chameleonvision/vision/VisionManager.java
index 23719c720..97bcbdd02 100644
--- a/Main/src/main/java/com/chameleonvision/vision/VisionManager.java
+++ b/Main/src/main/java/com/chameleonvision/vision/VisionManager.java
@@ -171,11 +171,11 @@ public class VisionManager {
         ConfigManager.saveCameraDriverMode(getCurrentCameraName(), driverModeSettings);
     }
 
-    public static List<String> getCameraResolutionList(CameraCapture capture) {
-        return capture.getProperties().getVideoModes().stream().map(Helpers::VideoModeToString).collect(Collectors.toList());
+    public static List<HashMap> getCameraResolutionList(CameraCapture capture) {
+        return capture.getProperties().getVideoModes().stream().map(object -> Helpers.VideoModeToHashMap(object)).collect(Collectors.toList());
     }
 
-    public static List<String> getCurrentCameraResolutionList() {
+    public static List<HashMap> getCurrentCameraResolutionList() {
         return getCameraResolutionList(currentUIVisionProcess.getCamera());
     }
 
diff --git a/Main/src/main/java/com/chameleonvision/web/SocketHandler.java b/Main/src/main/java/com/chameleonvision/web/SocketHandler.java
index caa0033e9..9874ad76e 100644
--- a/Main/src/main/java/com/chameleonvision/web/SocketHandler.java
+++ b/Main/src/main/java/com/chameleonvision/web/SocketHandler.java
@@ -240,7 +240,6 @@ public class SocketHandler {
         tmp.put("fov", currentCamera.getProperties().getFOV());
         tmp.put("streamDivisor", currentVisionProcess.cameraStreamer.getDivisor().ordinal());
         // TODO: (HIGH) get videomode index!
-//        tmp.put("resolution", currentCamera.getVideoModeIndex());
         return tmp;
     }
 
@@ -263,8 +262,6 @@ public class SocketHandler {
         CVPipeline currentPipeline = currentProcess.getCurrentPipeline();
 
         try {
-//            fullSettings.putAll(settingsToMap(ConfigManager.settings));
-//            fullSettings.putAll(pipelineToMap(currentPipeline.settings));
             fullSettings.put("settings", getOrdinalSettings());
             fullSettings.put("cameraSettings", getOrdinalCameraSettings());
             fullSettings.put("cameraList", VisionManager.getAllCameraNicknames());
diff --git a/chameleon-client/src/views/Camera.vue b/chameleon-client/src/views/Camera.vue
index 1044efebd..9e075efb7 100644
--- a/chameleon-client/src/views/Camera.vue
+++ b/chameleon-client/src/views/Camera.vue
@@ -212,7 +212,7 @@
         },
         data() {
             return {
-                selectedTab: 1,
+                selectedTab: 0,
                 // camera edit variables
                 isCameraNameEdit: false,
                 newCameraName: "",