diff --git a/admin/css/wpa-superstar-admin.css b/admin/css/wpa-superstar-admin.css
index 6546d45..959914b 100644
--- a/admin/css/wpa-superstar-admin.css
+++ b/admin/css/wpa-superstar-admin.css
@@ -11,4 +11,16 @@
 }
 .wpa-superstar-toggle {
     margin: 10px 0;
+}
+.nav-tab-wrapper {
+    margin-bottom: 20px;
+}
+.nav-tab {
+    background: #f1f1f1;
+    padding: 8px 16px;
+    border-radius: 4px 4px 0 0;
+}
+.nav-tab-active {
+    background: #fff;
+    border-bottom: 1px solid #fff;
 }
\ No newline at end of file
diff --git a/admin/settings.php b/admin/settings.php
index ead082b..d2ed41e 100644
--- a/admin/settings.php
+++ b/admin/settings.php
@@ -19,6 +19,7 @@ add_action( 'admin_menu', 'wpa_superstar_admin_menu' );
 function wpa_superstar_register_settings() {
     register_setting( 'wpa-superstar-settings', 'wpa_superstar_lazy_load' );
     register_setting( 'wpa-superstar-settings', 'wpa_superstar_minify_css' );
+    register_setting( 'wpa-superstar-settings', 'wpa_superstar_minify_js' );
 }
 add_action( 'admin_init', 'wpa_superstar_register_settings' );
 
@@ -34,26 +35,13 @@ add_action( 'wp_ajax_wpa_superstar_update_option', 'wpa_superstar_update_option'
 
 // Settings page HTML
 function wpa_superstar_settings_page() {
+    $active_tab = isset( $_GET['tab'] ) ? $_GET['tab'] : 'general';
     ?>
     <div class="wpa-superstar-wrap">
         <h1><?php echo esc_html( get_admin_page_title() ); ?></h1>
+        <h2 class="nav-tab-wrapper">
+            <a href="?page=wpa-superstar&tab=general" class="nav-tab <?php echo $active_tab == 'general' ? 'nav-tab-active' : ''; ?>">General</a>
+            <a href="?page=wpa-superstar&tab=advanced" class="nav-tab <?php echo $active_tab == 'advanced' ? 'nav-tab-active' : ''; ?>">Advanced</a>
+        </h2>
         <form method="post" action="options.php">
-            <?php settings_fields( 'wpa-superstar-settings' ); ?>
-            <?php do_settings_sections( 'wpa-superstar-settings' ); ?>
-            <div class="wpa-superstar-toggle">
-                <label>
-                    <input type="checkbox" name="wpa_superstar_lazy_load" value="1" <?php checked( get_option( 'wpa_superstar_lazy_load', 1 ) ); ?> />
-                    Enable lazy loading for images
-                </label>
-            </div>
-            <div class="wpa-superstar-toggle">
-                <label>
-                    <input type="checkbox" name="wpa_superstar_minify_css" value="1" <?php checked( get_option( 'wpa_superstar_minify_css', 0 ) ); ?> />
-                    Enable CSS minification
-                </label>
-            </div>
-            <?php submit_button(); ?>
-        </form>
-    </div>
-    <?php
-}
\ No newline at end of file
+            <?php settings_fields( 'wpa-superstar-settings' );
\ No newline at end of file
diff --git a/includes/speed-functions.php b/includes/speed-functions.php
index 1aabef1..1f55b0b 100644
--- a/includes/speed-functions.php
+++ b/includes/speed-functions.php
@@ -28,4 +28,17 @@ function wpa_superstar_minify_css( $html ) {
     );
     return trim( $html );
 }
-add_filter( 'style_loader_tag', 'wpa_superstar_minify_css' );
\ No newline at end of file
+add_filter( 'style_loader_tag', 'wpa_superstar_minify_css' );
+
+function wpa_superstar_minify_js( $html ) {
+    if ( is_admin() || ! get_option( 'wpa_superstar_minify_js', 0 ) ) {
+        return $html;
+    }
+    $html = preg_replace(
+        array( '/\s+/', '/\/\*.*?\*\//s', '//.*?\n/' ),
+        array( ' ', '', '' ),
+        $html
+    );
+    return trim( $html );
+}
+add_filter( 'script_loader_tag', 'wpa_superstar_minify_js' );
\ No newline at end of file