                     );
                     break;
                 case SCREEN_MAIN_CORE:
-                    drawScreen(
-                        formatNumbers(data.core, COMPACT_LONG, false, true, "RF"), 
-                        formatNumbers(data.gain, COMPACT_SHORT, true, true, "RF/t")
-                    );
-                    break;
-                case SCREEN_MAIN_BULLETIN: {
-                    String bullA = data.bulletin;
-                    String bullB = "";                    
-                    if (bullA.length() > 16)
-                        bullB = bullA.substring(16);
-                        
-                    drawScreen(
-                        bullA, 
-                        bullB
-                    );
-                    break;                    
-                }
+                    if (WiFi.status() != WL_CONNECTED || settings.wifi == COUNT_WIFI)
+                        drawScreen(
+                            "WiFi Unavailable", 
+                            ""
+                        );
+                    else   
+                        drawScreen(
+                            formatNumbers(data.core, COMPACT_LONG, false, true, "RF"), 
+                            formatNumbers(data.gain, COMPACT_SHORT, true, true, "RF/t")
+                        ); 
+                    break;
+                case SCREEN_MAIN_BULLETIN:
+                    if (WiFi.status() != WL_CONNECTED || settings.wifi == COUNT_WIFI)
+                        drawScreen(
+                            "WiFi Unavailable", 
+                            ""
+                        );
+                    else {
+                        String bullA = data.bulletin;
+                        String bullB = "";                    
+                        if (bullA.length() > 16)
+                            bullB = bullA.substring(16);
+                            
+                        drawScreen(
+                            bullA, 
+                            bullB
+                        );
+                    }    
+                    break;  
                 case SCREEN_MAIN_WIFI: {
-                    String wifi = "  Disconnected";
-                    if (WiFi.status() == WL_CONNECTED)
+                    String wifi = "  Connecting...";
+                    if (settings.wifi == COUNT_WIFI)
+                        wifi = "  Disabled";
+                    else if (WiFi.status() == WL_CONNECTED)
                         wifi = "  Connected";
                         
                     drawScreen(

void connectWiFi() {
    WiFi.mode(WIFI_STA);
    WiFi.hostname(host);
    WiFi.begin(ssid[settings.wifi], pass[settings.wifi]);
    /*
    while (WiFi.status() != WL_CONNECTED) {
        delay(500);

                process = true;
                break;
            case SCREEN_SETT_WIFI:
                if (settings.wifi >= COUNT_WIFI)
                    settings.wifi = 0;
                else    
                    settings.wifi++;
