diff --git a/main.html b/main.html
index 7c1cfee160..a0f4743816 100644
--- a/main.html
+++ b/main.html
@@ -101,7 +101,7 @@
             <div class="clear-both"></div>
             <div id="tabs">
                 <ul>
-                    <li class="first tab_initial_setup"><a href="#">Initial Setup</a></li>
+                    <li class="tab_initial_setup"><a href="#">Initial Setup</a></li>
                     <li class="tab_pid_tuning"><a href="#">PID Tuning</a></li>
                     <li class="tab_receiver"><a href="#">Receiver</a></li>
                     <li class="tab_auxiliary_configuration"><a href="#">Auxiliary Configuration</a></li>
diff --git a/main.js b/main.js
index 70fb6d038c..b0e11fb493 100644
--- a/main.js
+++ b/main.js
@@ -42,30 +42,43 @@ $(document).ready(function() {
             disable_timers();
             
             GUI.tab_switch_cleanup(function() {
-                // Disable previous active button
+                // disable previously active tab highlight
                 $('li', tabs).removeClass('active');
                 
-                // Highlight selected button
+                // get tab class name (there should be only one class listed)
+                var tab = $(self).parent().prop('class');
+                
+                // Highlight selected tab
                 $(self).parent().addClass('active');
                 
-                if ($(self).parent().hasClass('tab_initial_setup')) {
-                    $('#content').load("./tabs/initial_setup.html", tab_initialize_initial_setup);
-                } else if ($(self).parent().hasClass('tab_pid_tuning')) {
-                    $('#content').load("./tabs/pid_tuning.html", tab_initialize_pid_tuning);
-                } else if ($(self).parent().hasClass('tab_receiver')) {
-                    $('#content').load("./tabs/receiver.html", tab_initialize_receiver);
-                } else if ($(self).parent().hasClass('tab_auxiliary_configuration')) {
-                    $('#content').load("./tabs/auxiliary_configuration.html", tab_initialize_auxiliary_configuration);
-                } else if ($(self).parent().hasClass('tab_servos')) {
-                    $('#content').load("./tabs/servos.html", tab_initialize_servos);
-                } else if ($(self).parent().hasClass('tab_gps')) {
-                    $('#content').load("./tabs/gps.html", tab_initialize_gps);
-                } else if ($(self).parent().hasClass('tab_motor_outputs')) {
-                    $('#content').load("./tabs/motor_outputs.html", tab_initialize_motor_outputs);
-                } else if ($(self).parent().hasClass('tab_sensors')) {
-                    $('#content').load("./tabs/sensors.html", tab_initialize_sensors);
-                } else if ($(self).parent().hasClass('tab_cli')) {
-                    $('#content').load("./tabs/cli.html", tab_initialize_cli);
+                switch (tab) {
+                    case 'tab_initial_setup':
+                        $('#content').load("./tabs/initial_setup.html", tab_initialize_initial_setup);
+                        break;
+                    case 'tab_pid_tuning':
+                        $('#content').load("./tabs/pid_tuning.html", tab_initialize_pid_tuning);
+                        break;
+                    case 'tab_receiver':
+                        $('#content').load("./tabs/receiver.html", tab_initialize_receiver);
+                        break;
+                    case 'tab_auxiliary_configuration':
+                        $('#content').load("./tabs/auxiliary_configuration.html", tab_initialize_auxiliary_configuration);
+                        break;
+                    case 'tab_servos':
+                        $('#content').load("./tabs/servos.html", tab_initialize_servos);
+                        break;
+                    case 'tab_gps':
+                        $('#content').load("./tabs/gps.html", tab_initialize_gps);
+                        break;
+                    case 'tab_motor_outputs':
+                        $('#content').load("./tabs/motor_outputs.html", tab_initialize_motor_outputs);
+                        break;
+                    case 'tab_sensors':
+                        $('#content').load("./tabs/sensors.html", tab_initialize_sensors);
+                        break;    
+                    case 'tab_cli':
+                        $('#content').load("./tabs/cli.html", tab_initialize_cli);
+                        break;                         
                 }
             });
         }