diff --git a/client/forbidden-markers-configuration-map.html b/client/forbidden-markers-configuration-map.html
index 5d5369f8..fe0b0b1a 100644
--- a/client/forbidden-markers-configuration-map.html
+++ b/client/forbidden-markers-configuration-map.html
@@ -56,15 +56,14 @@
             const persistentData = {virtual_walls: map.getLocations().virtualWalls, no_go_areas: map.getLocations().forbiddenZones};
             loadingBarSaveMarkers.setAttribute("indeterminate", "indeterminate");
             saveButton.setAttribute("disabled", "disabled");
-            fn.requestWithPayload("api/persistent_data", JSON.stringify(persistentData), "PUT", function (err) {
+            fn.prequestWithPayload("api/persistent_data", JSON.stringify(persistentData), "PUT")
+            .then(() => {
+                ons.notification.toast("Successfully saved forbidden markers!", { buttonLabel: 'Dismiss', timeout: window.fn.toastOKTimeout });
+                fn.popPage();
+            }, (err) => ons.notification.toast(err, { buttonLabel: 'Dismiss', timeout: window.fn.toastErrorTimeout }))
+            .finally(() => {
                 loadingBarSaveMarkers.removeAttribute("indeterminate");
                 saveButton.removeAttribute("disabled");
-                if (err) {
-                    ons.notification.toast(err, { buttonLabel: 'Dismiss', timeout: window.fn.toastErrorTimeout })
-                } else {
-                    ons.notification.toast("Successfully saved forbidden markers!", { buttonLabel: 'Dismiss', timeout: window.fn.toastOKTimeout });
-                    fn.popPage();
-                }
             });
         }
     </script>
diff --git a/client/home.html b/client/home.html
index af20a096..dac8f760 100644
--- a/client/home.html
+++ b/client/home.html
@@ -1,4 +1,4 @@
-<ons-page>
+<ons-page id="home-page">
     <ons-progress-bar id="loading-bar-home" value="0" indeterminate="indeterminate"></ons-progress-bar>
     <section>
         <p id="robot-state">
@@ -43,7 +43,7 @@
 
 
     <script>
-        var currentRefreshTimer;
+        var currentRefreshTimer, refreshInProgress = false;
 
         var startButton = document.getElementById("start-button");
         var pauseButton = document.getElementById("pause-button");
@@ -105,20 +105,16 @@
                 throw new Error("Invalid button");
             } else {
                 btn.button.setAttribute("disabled", "disabled");
-
                 loadingBarHome.setAttribute("indeterminate", "indeterminate");
-                fn.request(btn.url, "PUT", function (err) {
-                    if (err) {
-                        btn.button.removeAttribute("disabled");
-                        loadingBarHome.removeAttribute("indeterminate");
-                        ons.notification.toast(err, { buttonLabel: 'Dismiss', timeout: window.fn.toastErrorTimeout })
-                    } else {
-                        window.clearTimeout(currentRefreshTimer);
-                        window.setTimeout(function () {
-                            updateHomePage();
-                        }, 500);
-                    }
-                })
+                fn.prequest(btn.url, "PUT")
+                .then(() => {
+                    window.clearTimeout(currentRefreshTimer);
+                    window.setTimeout(function () { updateHomePage(); }, 500);
+                }, (err) => {
+                    btn.button.removeAttribute("disabled");
+                    loadingBarHome.removeAttribute("indeterminate");
+                    ons.notification.toast(err, { buttonLabel: 'Dismiss', timeout: window.fn.toastErrorTimeout })
+                });
             }
         }
 
@@ -144,26 +140,24 @@
                         icon: 'md-close'
                     }
                 ]
-            }).then(function (index) {
+            })
+            .then(index => {
                 var level = Object.keys(fanspeedPresets)[index];
 
                 if (level) {
                     loadingBarHome.setAttribute("indeterminate", "indeterminate");
                     fanspeedButton.setAttribute("disabled", "disabled");
-                    fn.requestWithPayload("api/fanspeed", JSON.stringify({ speed: level }), "PUT", function (err, res) {
-                        if (err) {
-                            fanspeedButton.removeAttribute("disabled");
-                            loadingBarHome.removeAttribute("indeterminate");
-                            ons.notification.toast(err, { buttonLabel: 'Dismiss', timeout: window.fn.toastErrorTimeout })
-                        } else {
-                            window.clearTimeout(currentRefreshTimer);
-                            window.setTimeout(function () {
-                                updateHomePage();
-                            }, 150);
-                        }
-                    })
+                    fn.prequestWithPayload("api/fanspeed", JSON.stringify({ speed: level }), "PUT")
+                    .then(() => {
+                        window.clearTimeout(currentRefreshTimer);
+                        window.setTimeout(function () { updateHomePage(); }, 500);
+                    }, (err) => {
+                        fanspeedButton.removeAttribute("disabled");
+                        loadingBarHome.removeAttribute("indeterminate");
+                        ons.notification.toast(err, { buttonLabel: 'Dismiss', timeout: window.fn.toastErrorTimeout })
+                    });
                 } else {
-                    window.setTimeout(function () {
+                    currentRefreshTimer = window.setTimeout(function () {
                         updateHomePage();
                     }, 3000);
                 }
@@ -172,48 +166,50 @@
 
         function handleGoToButton() {
             window.clearTimeout(currentRefreshTimer);
-            var options = []
+            var options = [];
 
-            for(var i=0; i < config.spots.length; i++){
+            for(var i = 0; i < config.spots.length; i++) {
                 options.push(config.spots[i][0]);
             }
 
             options.push({
-                        label: 'Cancel',
-                        icon: 'md-close'
-                    });
+                label: 'Cancel',
+                icon: 'md-close'
+            });
 
             ons.openActionSheet({
                 title: 'Go to',
                 cancelable: true,
                 buttons: options
-            }).then(function (index) {
+            }).then(index => {
                 if(index > -1 && index < config.spots.length){
                     document.getElementById('appTabbar').setActiveTab(1,{callback: function() {
-                        fn.updateMapPage(true).then(function(map) {
+                        fn.updateMapPage(true)
+                        .then(function(map) {
                             map.addSpot([config.spots[index][1],config.spots[index][2]]);
-                        }).catch(() => {});
+                        })
+                        .catch(() => {});
                     }});
                 } else {
-                    window.setTimeout(function () {
-                                updateHomePage();
-                            }, 3000);
+                    currentRefreshTimer = window.setTimeout(function () {
+                        updateHomePage();
+                    }, 3000);
                 }
             });
         }
 
         function handleAreaButton() {
             window.clearTimeout(currentRefreshTimer);
-            var options = []
+            var options = [];
 
-            for(var i=0; i < config.areas.length; i++){
+            for(var i = 0; i < config.areas.length; i++) {
                 options.push(config.areas[i][0]);
             }
 
             options.push({
-                        label: 'Cancel',
-                        icon: 'md-close'
-                    });
+                label: 'Cancel',
+                icon: 'md-close'
+            });
 
             var payload, calcPayload, zoneNumber = 0;
 
@@ -221,30 +217,33 @@
                 title: 'Clean zone',
                 cancelable: true,
                 buttons: options
-            }).then(function (index) {
+            })
+            .then(index => {
                 if(index > -1 && index < config.areas.length){
                     if (zoneNumber < 2) {
                         payload = config.areas[index][1];
                     }
                     if (!payload.length) {
                         ons.notification.alert('You\'ve chosen an empty zone to clean. Please set it up first.');
-                        window.setTimeout(function () {
+                        currentRefreshTimer = window.setTimeout(function () {
                             updateHomePage();
                         }, 3000);
                         return;
                     }
                     document.getElementById('appTabbar').setActiveTab(1,{callback: function() {
-                        fn.updateMapPage(true).then(function(map) {
+                        fn.updateMapPage(true)
+                        .then(function(map) {
                             map.clearZones();
                             payload.forEach(function(zone) {
                                 map.addZone([zone[0], zone[1], zone[2], zone[3]], true);
                             });
-                        }).catch(() => {});
+                        })
+                        .catch(() => {});
                     }});
                 } else {
-                    window.setTimeout(function () {
-                                updateHomePage();
-                            }, 3000);
+                    currentRefreshTimer = window.setTimeout(function () {
+                        updateHomePage();
+                    }, 3000);
                 }
             });
             var zoneButtons = document.querySelectorAll('ons-action-sheet-button');
@@ -254,7 +253,6 @@
                     zoneButtons[i].insertAdjacentHTML('beforeend','<label class="zone-cblabel"><input type="checkbox" class="zone-checkbox" data-id="' + i + '"></input></label><span class="zone-numspan"></span>')
                 }
             }
-            
             calcPayload = function() {
                 var payload = [];
                 var zoneCheckboxes = document.querySelectorAll('.zone-checkbox');
@@ -321,82 +319,89 @@
         }
 
         function updateHomePage() {
+            if (refreshInProgress) {
+                return;
+            }
+            refreshInProgress = true;
+            window.clearTimeout(currentRefreshTimer);
             loadingBarHome.setAttribute("indeterminate", "indeterminate");
-            fn.request("api/current_status", "GET", function (err, res) {
-                loadingBarHome.removeAttribute("indeterminate");
-                fanspeedButton.removeAttribute("disabled");
-                findRobotButton.removeAttribute("disabled");
-                spotButton.removeAttribute("disabled");
-
-                if (err) {
-                    ons.notification.toast(err, { buttonLabel: 'Dismiss', timeout: window.fn.toastErrorTimeout })
-                } else {
-                    batteryStatusText.innerHTML = "Battery: " + res.battery + "%";
-                    batteryStatusBar.value = res.battery;
-
-                    robotState.innerHTML = res.human_state;
-                    if (res.error_code != 0) {
-                        robotState.innerHTML +=
-                            '<span class="robot-error"><ons-icon icon="fa-exclamation-triangle"></ons-icon> ' +
-                            res.human_error +
-                            ' <ons-icon icon="fa-exclamation-triangle"></ons-icon></span>';
-                    }
+            fn.prequest("api/current_status", "GET")
+            .then((res) => {
+                batteryStatusText.innerHTML = "Battery: " + res.battery + "%";
+                batteryStatusBar.value = res.battery;
+
+                robotState.innerHTML = res.human_state;
+                if (res.error_code != 0) {
+                    robotState.innerHTML +=
+                        '<span class="robot-error"><ons-icon icon="fa-exclamation-triangle"></ons-icon> ' +
+                        res.human_error +
+                        ' <ons-icon icon="fa-exclamation-triangle"></ons-icon></span>';
+                }
 
-                    if (res.in_cleaning === 1 || res.in_cleaning === 2 || res.state === 11 || res.state === 16) {
-                        if (res.state === 3 || res.state === 10 || res.state === 2) {
-                            pauseButton.setAttribute("disabled", "disabled");
-                            startButton.removeAttribute("disabled");
-                        } else {
-                            pauseButton.removeAttribute("disabled");
-                            startButton.setAttribute("disabled", "disabled");
-                        }
-                        spotButton.setAttribute("disabled", "disabled");
-                    } else {
-                        spotButton.removeAttribute("disabled");
+                if (res.in_cleaning === 1 || res.in_cleaning === 2 || res.state === 11 || res.state === 16) {
+                    if (res.state === 3 || res.state === 10 || res.state === 2) {
                         pauseButton.setAttribute("disabled", "disabled");
-                        if (res.state !== 6) {
-                            startButton.removeAttribute("disabled");
-                        } else {
-                            pauseButton.removeAttribute("disabled");
-                            startButton.setAttribute("disabled", "disabled");
-                        }
-                    }
-
-                    if (res.state === 8 || res.state === 15 || res.state === 10 || res.state === 11 || res.state === 3 || res.state === 6 || res.state === 16) {
-                        stopButton.setAttribute("disabled", "disabled");
+                        startButton.removeAttribute("disabled");
                     } else {
-                        stopButton.removeAttribute("disabled");
+                        pauseButton.removeAttribute("disabled");
+                        startButton.setAttribute("disabled", "disabled");
                     }
-
-                    if (res.state === 5 || res.state === 6 || res.state === 8 || res.state === 9 ||  res.state === 11 || res.state === 16 || res.state === 17) {
-                        homeButton.setAttribute("disabled", "disabled");
+                    spotButton.setAttribute("disabled", "disabled");
+                } else {
+                    spotButton.removeAttribute("disabled");
+                    pauseButton.setAttribute("disabled", "disabled");
+                    if (res.state !== 6) {
+                        startButton.removeAttribute("disabled");
                     } else {
-                        homeButton.removeAttribute("disabled");
+                        pauseButton.removeAttribute("disabled");
+                        startButton.setAttribute("disabled", "disabled");
                     }
+                }
 
-                    robotStateDetailsM2.innerHTML = "Area: " + ("00" + (res.clean_area / 1000000).toFixed(2)).slice(-6) + " m²";
-                    robotStateDetailsTime.innerHTML = "Time: " + window.fn.secondsToHms(res.clean_time);
-                    fanspeedButton.innerHTML = "<ons-icon icon=\"fa-superpowers\"></ons-icon> " + (fanspeedPresets[res.fan_power] || `Custom ${res.fan_power}%`);
+                if (res.state === 8 || res.state === 15 || res.state === 10 || res.state === 11 || res.state === 3 || res.state === 6 || res.state === 16) {
+                    stopButton.setAttribute("disabled", "disabled");
+                } else {
+                    stopButton.removeAttribute("disabled");
+                }
 
-                    currentRefreshTimer = window.setTimeout(function () {
-                        updateHomePage();
-                    }.bind(this), 5000);
+                if (res.state === 5 || res.state === 6 || res.state === 8 || res.state === 9 ||  res.state === 11 || res.state === 16 || res.state === 17) {
+                    homeButton.setAttribute("disabled", "disabled");
+                } else {
+                    homeButton.removeAttribute("disabled");
                 }
+
+                robotStateDetailsM2.innerHTML = "Area: " + ("00" + (res.clean_area / 1000000).toFixed(2)).slice(-6) + " m²";
+                robotStateDetailsTime.innerHTML = "Time: " + window.fn.secondsToHms(res.clean_time);
+                fanspeedButton.innerHTML = "<ons-icon icon=\"fa-superpowers\"></ons-icon> " + (fanspeedPresets[res.fan_power] || `Custom ${res.fan_power}%`);
+            }, (err) => {
+                ons.notification.toast(err, { buttonLabel: 'Dismiss', timeout: window.fn.toastErrorTimeout })
             })
-        }
+            .finally(() => {
+                refreshInProgress = false;
+                loadingBarHome.removeAttribute("indeterminate");
+                fanspeedButton.removeAttribute("disabled");
+                findRobotButton.removeAttribute("disabled");
+                spotButton.removeAttribute("disabled");
+
+                currentRefreshTimer = window.setTimeout(function () {
+                    updateHomePage();
+                }.bind(this), 5000);
+            });
+        };
 
         ons.getScriptPage().onShow = function () {
             /* check for area and go to configuration */
-            fn.request("api/get_config", "GET", function (err, res) {
+            fn.prequest("api/get_config", "GET")
+            .then((res) => {
                 config = res;
-                if(config.spots)
-                    if(config.spots.length > 0)
-                        goToButton.removeAttribute("disabled");
-                if(config.areas)
-                    if(config.areas.length > 0)
-                        areaButton.removeAttribute("disabled");
+                if (config.spots && config.spots.length > 0)
+                    goToButton.removeAttribute("disabled");
+                if (config.areas && config.areas.length > 0)
+                    areaButton.removeAttribute("disabled");
+            })
+            .finally(() => {
+                updateHomePage();
             });
-            updateHomePage();
         };
 
         ons.getScriptPage().onHide = function () {
diff --git a/client/manualcontrol.html b/client/manualcontrol.html
index 317c29c1..56b214ff 100644
--- a/client/manualcontrol.html
+++ b/client/manualcontrol.html
@@ -34,19 +34,21 @@
         //API / Manual Control Handling
         function manualMoveRobot(angle, velocity) {
             manualControlLoadingBar.setAttribute("indeterminate", "indeterminate");
-            fn.requestWithPayload("api/set_manual_control", JSON.stringify({
+            fn.prequestWithPayload("api/set_manual_control", JSON.stringify({
                 angle: angle,
                 velocity: velocity,
                 //move for twice the interval we're updating at
                 //to keep on track if one package got lost
                 duration: manualControlDurationMS*2,
                 sequenceId: manualControlSequenceId++
-            }), "PUT", function (err) {
-                if (err) {
-                    ons.notification.toast(err, { buttonLabel: 'Dismiss', timeout: window.fn.toastErrorTimeout })
-                }
+            }), "PUT")
+            .then(
+                _ => {},
+                err => ons.notification.toast(err, { buttonLabel: 'Dismiss', timeout: window.fn.toastErrorTimeout })
+            )
+            .finally(() => {
                 manualControlLoadingBar.removeAttribute("indeterminate");
-            })
+            });
         }
 
         function _startManualControl() {
@@ -84,30 +86,24 @@
         function startManualControl() {
             if (!manualControlEnabled) {
                 manualControlLoadingBar.setAttribute("indeterminate", "indeterminate");
-                fn.request("api/start_manual_control", "PUT", function (err) {
-                    if (err) {
-                        ons.notification.toast(err, { buttonLabel: 'Dismiss', timeout: window.fn.toastErrorTimeout })
-                    } else {
-                        _startManualControl();
-                        postponeRefreshManualControlMode();
-                    }
-                    manualControlLoadingBar.removeAttribute("indeterminate");
-                })
+                fn.prequest("api/start_manual_control", "PUT")
+                .then(() => {
+                    _startManualControl();
+                    postponeRefreshManualControlMode();
+                }, (err) => ons.notification.toast(err, { buttonLabel: 'Dismiss', timeout: window.fn.toastErrorTimeout }))
+                .finally(() => manualControlLoadingBar.removeAttribute("indeterminate"));
             }
         }
 
         function stopManualControl() {
             if (manualControlEnabled) {
                 manualControlLoadingBar.setAttribute("indeterminate", "indeterminate");
-                fn.request("api/stop_manual_control", "PUT", function (err) {
-                    if (err) {
-                        ons.notification.toast(err, { buttonLabel: 'Dismiss', timeout: window.fn.toastErrorTimeout })
-                    } else {
-                        _stopManualControl();
-                        postponeRefreshManualControlMode();
-                    }
-                    manualControlLoadingBar.removeAttribute("indeterminate");
-                });
+                fn.prequest("api/stop_manual_control", "PUT")
+                .then(() => {
+                    _stopManualControl();
+                    postponeRefreshManualControlMode();
+                }, (err) => ons.notification.toast(err, { buttonLabel: 'Dismiss', timeout: window.fn.toastErrorTimeout }))
+                .finally(() => manualControlLoadingBar.removeAttribute("indeterminate"));
             }
         }
 
@@ -270,23 +266,20 @@
                     }
                 }
             }
-        }
+        };
 
         //Page Handling (refresh/update/onload/onhide)
         function refreshManualControlMode() {
-            fn.request("api/current_status", "GET", function (err, res) {
-                if (err) {
-                    ons.notification.toast(err, { buttonLabel: 'Dismiss', timeout: window.fn.toastErrorTimeout })
+            fn.prequest("api/current_status", "GET")
+            .then((res) => {
+                if (res.state === 7) { //7: manual
+                    _startManualControl();
                 } else {
-                    if (res.state === 7) { //7: manual
-                        _startManualControl();
-                    } else {
-                        _stopManualControl();
-                    }
+                    _stopManualControl();
                 }
-                manualControlLoadingBar.removeAttribute("indeterminate");
-            });
-        }
+            }, (err) => ons.notification.toast(err, { buttonLabel: 'Dismiss', timeout: window.fn.toastErrorTimeout }))
+            .finally(() => manualControlLoadingBar.removeAttribute("indeterminate"));
+        };
 
         ons.getScriptPage().onShow = function () {
             manualControlLoadingBar.setAttribute("indeterminate", "indeterminate");
diff --git a/client/map.html b/client/map.html
index e3c5fd00..5cdb1a04 100644
--- a/client/map.html
+++ b/client/map.html
@@ -37,29 +37,30 @@
                     resolve(map);
                 }
                 loadingBar.setAttribute("indeterminate", "indeterminate");
-                fn.request("api/map/latest", "GET", function (err, mapData) {
-                    loadingBar.removeAttribute("indeterminate");
-                    if (!err) {
-                        if(map === null) {
-                            map = new VacuumMap(document.getElementById('map-canvas'));
-                            map.initCanvas(mapData);
-                        } else {
-                            map.updateMap(mapData);
-                        }
-                        map.initWebSocket();
-                        resolve(map);
+                fn.prequest("api/map/latest", "GET")
+                .then(mapData => {
+                    if(map === null) {
+                        map = new VacuumMap(document.getElementById('map-canvas'));
+                        map.initCanvas(mapData);
                     } else {
-                        ons.notification.toast(err, { buttonLabel: 'Dismiss', timeout: window.fn.toastErrorTimeout })
-                        reject();
+                        map.updateMap(mapData);
                     }
+                    map.initWebSocket();
+                    resolve(map);
+                }, err => {
+                    ons.notification.toast(err, { buttonLabel: 'Dismiss', timeout: window.fn.toastErrorTimeout })
+                    reject();
                 })
+                .finally(() => {
+                    loadingBar.removeAttribute("indeterminate");
+                });
             });
         };
 
         // Register update function to be accessible outside of es6 module (see <script> below)
         window.fn.updateMapPage = updateMapPage;
         window.fn.cancelUpdateMap = () => {
-            if(map !== null) {
+            if (map !== null) {
                 map.closeWebSocket();
             }
         };
@@ -71,16 +72,16 @@
             let button = document.getElementById("goto");
             loadingBar.setAttribute("indeterminate", "indeterminate");
             button.setAttribute("disabled", "disabled");
-            fn.requestWithPayload("api/go_to", JSON.stringify(point), "PUT", function (err) {
+            fn.prequestWithPayload("api/go_to", JSON.stringify(point), "PUT")
+            .then(
+                (res) => ons.notification.toast("Command successfully sent!", { buttonLabel: 'Dismiss', timeout: window.fn.toastOKTimeout }),
+                (err) => ons.notification.toast(err, { buttonLabel: 'Dismiss', timeout: window.fn.toastErrorTimeout })
+            )
+            .finally(() => {
                 loadingBar.removeAttribute("indeterminate");
                 button.removeAttribute("disabled");
-                if (err) {
-                    ons.notification.toast(err, { buttonLabel: 'Dismiss', timeout: window.fn.toastErrorTimeout })
-                } else {
-                    ons.notification.toast("Command successfully sent!", { buttonLabel: 'Dismiss', timeout: window.fn.toastOKTimeout });
-                }
             });
-        }
+        };
 
         /**
          * Calls the zoned_cleanup api route with the currently set zone
@@ -89,16 +90,16 @@
             let button = document.getElementById("start_zoned_cleanup");
             loadingBar.setAttribute("indeterminate", "indeterminate");
             button.setAttribute("disabled", "disabled");
-            fn.requestWithPayload("api/start_cleaning_zone", JSON.stringify(zones), "PUT", function (err) {
+            fn.prequestWithPayload("api/start_cleaning_zone", JSON.stringify(zones), "PUT")
+            .then(
+                (res) => ons.notification.toast("Command successfully sent!", { buttonLabel: 'Dismiss', timeout: window.fn.toastOKTimeout }),
+                (err) => ons.notification.toast(err, { buttonLabel: 'Dismiss', timeout: window.fn.toastErrorTimeout })
+            )
+            .finally(() => {
                 loadingBar.removeAttribute("indeterminate");
                 button.removeAttribute("disabled");
-                if (err) {
-                    ons.notification.toast(err, { buttonLabel: 'Dismiss', timeout: window.fn.toastErrorTimeout })
-                } else {
-                    ons.notification.toast("Command successfully sent!", { buttonLabel: 'Dismiss', timeout: window.fn.toastOKTimeout });
-                }
             });
-        }
+        };
 
         document.getElementById("goto").onclick = () => {
             const gotoPoint = map.getLocations().gotoPoints[0];
@@ -121,12 +122,9 @@
         }
         document.getElementById("map_reload_button").onclick = () => {
             loadingBar.setAttribute("indeterminate", "indeterminate");
-            fn.request("api/poll_map", "GET", function (err, data) {
-                setTimeout(() => {
-                    loadingBar.removeAttribute("indeterminate");
-                    updateMapPage();
-                }, 300);
-            });
+            fn.prequest("api/poll_map", "GET")
+            .then(null, (err) => ons.notification.toast(err, { buttonLabel: 'Dismiss', timeout: window.fn.toastErrorTimeout }))
+            .finally (() => loadingBar.removeAttribute("indeterminate"));
         }
         document.getElementById("map-canvas").addEventListener('zoneSelection', (e) => {
             document.getElementById("promote_zone").style.display = e.detail.state ? "" : "none";
diff --git a/client/settings-access-control.html b/client/settings-access-control.html
index 96bb7850..1b646fb6 100644
--- a/client/settings-access-control.html
+++ b/client/settings-access-control.html
@@ -115,65 +115,54 @@
         };
         function updateSettingsAccessControlPage() {
             loadingBarSettingsAccessControl.setAttribute("indeterminate", "indeterminate");
-            fn.request("api/http_auth_config", "GET", function (err, res) {
-                if (!err) {
-                    httpAuthInputEnabled.checked = res.enabled;
-                    httpAuthInputUsername.value = res.username;
-                    httpAuthInputPassword.value = "";
-                    fn.request("api/get_ssh_keys", "GET", function (err, res) {
-                        if (!err) {
-                            sshKeysTextArea.value = res;
 
-                            sshKeysTitle.style.display = "block";
-                            sshKeysList.style.display = "block";
-                        }
-                        loadingBarSettingsAccessControl.removeAttribute("indeterminate");
-                    });
-                } else {
-                    ons.notification.toast(err, { buttonLabel: 'Dismiss', timeout: window.fn.toastErrorTimeout })
-                }
-            });
-        }
+            const getAuthCfg = fn.prequest("api/http_auth_config", "GET")
+            .then((res) => {
+                httpAuthInputEnabled.checked = res.enabled;
+                httpAuthInputUsername.value = res.username;
+                httpAuthInputPassword.value = "";
+            },(err) => ons.notification.toast(err, { buttonLabel: 'Dismiss', timeout: window.fn.toastErrorTimeout }));
+
+            const getSshCfg = fn.prequest("api/get_ssh_keys", "GET")
+            .then((res) => {
+                sshKeysTextArea.value = res;
+                sshKeysTitle.style.display = "block";
+                sshKeysList.style.display = "block";
+            },(err) => ons.notification.toast(err, { buttonLabel: 'Dismiss', timeout: window.fn.toastErrorTimeout }));
+
+            Promise.all([getAuthCfg, getSshCfg]).finally(() => loadingBarSettingsAccessControl.removeAttribute("indeterminate"));
+        };
         function handleSSHKeysSettingsSaveButton() {
             loadingBarSettingsAccessControl.setAttribute("indeterminate", "indeterminate");
-            fn.requestWithPayload("api/set_ssh_keys", JSON.stringify({
+            fn.prequestWithPayload("api/set_ssh_keys", JSON.stringify({
                  keys: sshKeysTextArea.value
-            }), "PUT", function (err) {
-                if (err) {
-                    ons.notification.toast(err, { buttonLabel: 'Dismiss', timeout: window.fn.toastErrorTimeout })
-                }
-                loadingBarSettingsAccessControl.removeAttribute("indeterminate");
-            });
-        }
+            }), "PUT")
+            .then(null, (err) => ons.notification.toast(err, { buttonLabel: 'Dismiss', timeout: window.fn.toastErrorTimeout }))
+            .finally(() => loadingBarSettingsAccessControl.removeAttribute("indeterminate"));
+        };
         function handleSSHKeysSettingsPermanentlyDisableButton() {
             loadingBarSettingsAccessControl.setAttribute("indeterminate", "indeterminate");
-            fn.requestWithPayload("api/ssh_keys_permanently_disable", JSON.stringify({
+            fn.prequestWithPayload("api/ssh_keys_permanently_disable", JSON.stringify({
                  confirmation: sshKeysInputDisableConfirmation.value
-            }), "PUT", function (err) {
-                if (err) {
-                    ons.notification.toast(err, { buttonLabel: 'Dismiss', timeout: window.fn.toastErrorTimeout })
-                    } else {
-                    sshKeysTitle.style.display = "none";
-                    sshKeysList.style.display = "none";
-                }
-                loadingBarSettingsAccessControl.removeAttribute("indeterminate");
-            });
-        }
+            }), "PUT")
+            .then((res) => {
+                sshKeysTitle.style.display = "none";
+                sshKeysList.style.display = "none";
+            }, (err) => ons.notification.toast(err, { buttonLabel: 'Dismiss', timeout: window.fn.toastErrorTimeout }))
+            .finally(() => loadingBarSettingsAccessControl.removeAttribute("indeterminate"));
+        };
         function handleHttpAuthSettingsSaveButton() {
             loadingBarSettingsAccessControl.setAttribute("indeterminate", "indeterminate");
             if (httpAuthInputPassword.value !== httpAuthInputPasswordConfirm.value) {
                 return ons.notification.toast("Passwords don't match", { buttonLabel: 'Dismiss', timeout: window.fn.toastErrorTimeout });
             }
-            fn.requestWithPayload("api/http_auth_config", JSON.stringify({
+            fn.prequestWithPayload("api/http_auth_config", JSON.stringify({
                 enabled: httpAuthInputEnabled.checked === true,
                 username: httpAuthInputUsername.value,
                 password: httpAuthInputPassword.value,
-            }), "PUT", function (err) {
-                if (err) {
-                      ons.notification.toast(err, { buttonLabel: 'Dismiss', timeout: window.fn.toastErrorTimeout })
-                }
-                loadingBarSettingsAccessControl.removeAttribute("indeterminate");
-            });
-        }
+            }), "PUT")
+            .then(null, (err) => ons.notification.toast(err, { buttonLabel: 'Dismiss', timeout: window.fn.toastErrorTimeout }))
+            .finally(() => loadingBarSettingsAccessControl.removeAttribute("indeterminate"));
+        };
     </script>
 </ons-page>
\ No newline at end of file
diff --git a/client/settings-carpet-mode.html b/client/settings-carpet-mode.html
index 94b6bdc7..dc9c73a3 100644
--- a/client/settings-carpet-mode.html
+++ b/client/settings-carpet-mode.html
@@ -70,21 +70,18 @@
 
         function updateSettingsCarpetModePage() {
             loadingBarSettingsCarpetMode.setAttribute("indeterminate", "indeterminate");
-            fn.request("api/get_carpet_mode", "GET", function (err, res) {
-                loadingBarSettingsCarpetMode.removeAttribute("indeterminate");
-                if (err) {
-                    ons.notification.toast(err, { buttonLabel: 'Dismiss', timeout: window.fn.toastErrorTimeout })
-                } else {
-                    var carpetForm = document.getElementById('carpet-mode-form');
-                    var result = res[0];
-                    carpetForm.current_low.value = result.current_low;
-                    carpetForm.current_high.value = result.current_high;
-                    carpetForm.current_integral.value = result.current_integral;
-                    carpetForm.stall_time.value = result.stall_time;
-                    document.getElementById('carpet_mode_enabled').checked = (result.enable==1);
-                }
-            })
-        }
+            fn.prequest("api/get_carpet_mode", "GET")
+            .then((res) => {
+                var carpetForm = document.getElementById('carpet-mode-form');
+                var result = res[0];
+                carpetForm.current_low.value = result.current_low;
+                carpetForm.current_high.value = result.current_high;
+                carpetForm.current_integral.value = result.current_integral;
+                carpetForm.stall_time.value = result.stall_time;
+                document.getElementById('carpet_mode_enabled').checked = (result.enable==1);
+            },(err) => ons.notification.toast(err, { buttonLabel: 'Dismiss', timeout: window.fn.toastErrorTimeout }))
+            .finally(() => loadingBarSettingsCarpetMode.removeAttribute("indeterminate"));
+        };
 
         function saveCarpetMode() {
             ons.notification.confirm('Do you really want to save the modifications made in the carpet mode?').then(function (answer) {
@@ -96,16 +93,14 @@
                     var current_integral = carpetForm.current_integral.value;
                     var stall_time = carpetForm.stall_time.value;
                     var enable = (document.getElementById('carpet_mode_enabled').checked == true);
-                    fn.requestWithPayload("api/set_carpet_mode", JSON.stringify({ enable, current_low, current_high, current_integral, stall_time }), "PUT", function (err, res) {
-                        if (err) {
-                            loadingBarSettingsCarpetMode.removeAttribute("indeterminate");
-                            ons.notification.toast(err, { buttonLabel: 'Dismiss', timeout: window.fn.toastErrorTimeout })
-                        } else {
-                            updateSettingsCarpetModePage();
-                        }
-                    })
+                    fn.prequestWithPayload("api/set_carpet_mode", JSON.stringify({ enable, current_low, current_high, current_integral, stall_time }), "PUT")
+                    .then(
+                        (res) => updateSettingsCarpetModePage(),
+                        (err) => ons.notification.toast(err, { buttonLabel: 'Dismiss', timeout: window.fn.toastErrorTimeout })
+                    )
+                    .finally(() => loadingBarSettingsCarpetMode.removeAttribute("indeterminate"));
                 }
             });
-        }
+        };
     </script>
 </ons-page>
\ No newline at end of file
diff --git a/client/settings-cleaning-history.html b/client/settings-cleaning-history.html
index 30841dd0..16328fa9 100644
--- a/client/settings-cleaning-history.html
+++ b/client/settings-cleaning-history.html
@@ -38,25 +38,19 @@
             while (settingsCleaningHistory.lastChild) {
                 settingsCleaningHistory.removeChild(settingsCleaningHistory.lastChild);
             }
-            fn.request("api/clean_summary", "GET", function (err, res) {
-                if (!err) {
-                    //summary succeeded
-                    historyArray = res[3];
-                    // getting current timezone for properly showing local time
-                    fn.request("api/get_timezone", "GET", function (err, res) {
-                        loadingBarSettingsCleaningHistory.removeAttribute("indeterminate");
-                        if (!err) {
-                            timeZone = res;
-                            loadNextRemainingElements();
-                        } else {
-                            ons.notification.toast(err, { buttonLabel: 'Dismiss', timeout: window.fn.toastErrorTimeout })
-                        }
-                    });
-                } else {
-                    loadingBarSettingsCleaningHistory.removeAttribute("indeterminate");
-                    ons.notification.toast(err, { buttonLabel: 'Dismiss', timeout: window.fn.toastErrorTimeout })
-                }
+            const getSummary = fn.prequest("api/clean_summary", "GET")
+            .then((res) => {
+                historyArray = res[3];
+            });
+            const getTimezone = fn.prequest("api/get_timezone", "GET")
+            .then((res) => {
+                timeZone = res;
             });
+            Promise.all([getSummary, getTimezone])
+            .then(() => {
+                loadNextRemainingElements();
+            }, (err) => ons.notification.toast(err, { buttonLabel: 'Dismiss', timeout: window.fn.toastErrorTimeout }))
+            .finally(() => loadingBarSettingsCleaningHistory.removeAttribute("indeterminate"));
         }
 
         function formatTwoDigitNumber(number) {
@@ -74,62 +68,59 @@
             if (remainingShownCount>0) {
                 loadingBarSettingsCleaningHistory.setAttribute("indeterminate", "indeterminate");
                 var historyTimestamp = historyArray.shift(); //array is sorted with latest items in the beginning
-                fn.requestWithPayload("api/clean_record", JSON.stringify({recordId : historyTimestamp}) , "PUT", function (err, res) {
-                    loadingBarSettingsCleaningHistory.removeAttribute("indeterminate");
-                    if (err) {
-                        ons.notification.toast(err, { buttonLabel: 'Dismiss', timeout: window.fn.toastErrorTimeout });
-                    } else {
-                        //adjust counters
-                        remainingShownCount--;
-                        //set variables
-                        var currentEntryId = historyArray.length+1;
-                        var fromTime = formatDate(new Date(new Date(res.startTime).toLocaleString("en-US", { timeZone: timeZone })));
-                        var durationTotalSeconds = res.duration;
-                        var durationHours = Math.floor(durationTotalSeconds / 3600);
-                        var remsecs = durationTotalSeconds % 3600;
-                        var durationMinutes = Math.floor(remsecs / 60);
-                        var durationSeconds = (remsecs % 60);
-                        var area = Math.round(res.area / 1000000);
-                        var errorCode = res.errorCode;
-                        var errorDescription = res.errorDescription;
-                        var completedFlag = res.finishedFlag;
-                        settingsCleaningHistory.appendChild(ons.createElement(
-                            "<ons-list-item title='Show cleaning map' style='cursor: pointer' onclick='switchToMapView(" + historyTimestamp + ");'>\n" +
-                            "   <ons-row>" +
-                            "       <ons-col></ons-col>" +
-                            "       <ons-col width='400px' vertical-align='center' style='text-align:center;'>#" + currentEntryId + " started on " + fromTime + "</ons-col>" +
-                            "       <ons-col></ons-col>" +
-                            "   </ons-row>" +
-                            "   <ons-row>" +
-                            "       <ons-col></ons-col>" +
-                            "       <ons-col vertical-align='center' width='100px'>Duration</ons-col>" +
-                            "       <ons-col vertical-align='center' width='150px'>" + durationHours + ":" + formatTwoDigitNumber(durationMinutes) + ":" + formatTwoDigitNumber(durationSeconds) + "</ons-col>" +
-                            "       <ons-col></ons-col>" +
-                            "   </ons-row>"+
-                            "   <ons-row>" +
-                            "       <ons-col></ons-col>" +
-                            "       <ons-col vertical-align='center' width='100px'>Area</ons-col>" +
-                            "       <ons-col vertical-align='center' width='150px'>" + area + " m<sup>2</sup></ons-col>" +
-                            "       <ons-col></ons-col>" +
-                            "   </ons-row>"+
-                            "   <ons-row>" +
-                            "       <ons-col></ons-col>" +
-                            "       <ons-col vertical-align='center' width='100px'>Completed</ons-col>" +
-                            "       <ons-col vertical-align='center' width='150px'>" + (completedFlag?"<ons-icon icon='fa-check-circle' style='color:green;'>":"<ons-icon icon='fa-times-circle' style='color:red;'>") + "</ons-col>" +
-                            "       <ons-col></ons-col>" +
-                            "   </ons-row>"+
-                            (errorCode>0?
-                            "   <ons-row>" +
-                            "       <ons-col></ons-col>" +
-                            "       <ons-col vertical-align='center' width='400px' style='text-align:center;'><ons-icon icon='fa-warning' style='color:red;'></ons-icon>&nbsp;" + errorDescription + " (Code: " + errorCode + ")</ons-col>" +
-                            "       <ons-col></ons-col>" +
-                            "   </ons-row>"
-                            : "" ) +
-                            "</ons-list-item>"));
-                        //load next element
-                        loadNextRemainingElements();
-                    }
-                });
+                fn.prequestWithPayload("api/clean_record", JSON.stringify({recordId : historyTimestamp}), "PUT")
+                .then((res) => {
+                    //adjust counters
+                    remainingShownCount--;
+                    //set variables
+                    var currentEntryId = historyArray.length+1;
+                    var fromTime = formatDate(new Date(new Date(res.startTime).toLocaleString("en-US", { timeZone: timeZone })));
+                    var durationTotalSeconds = res.duration;
+                    var durationHours = Math.floor(durationTotalSeconds / 3600);
+                    var remsecs = durationTotalSeconds % 3600;
+                    var durationMinutes = Math.floor(remsecs / 60);
+                    var durationSeconds = (remsecs % 60);
+                    var area = Math.round(res.area / 1000000);
+                    var errorCode = res.errorCode;
+                    var errorDescription = res.errorDescription;
+                    var completedFlag = res.finishedFlag;
+                    settingsCleaningHistory.appendChild(ons.createElement(
+                        "<ons-list-item title='Show cleaning map' style='cursor: pointer' onclick='switchToMapView(" + historyTimestamp + ");'>\n" +
+                        "   <ons-row>" +
+                        "       <ons-col></ons-col>" +
+                        "       <ons-col width='400px' vertical-align='center' style='text-align:center;'>#" + currentEntryId + " started on " + fromTime + "</ons-col>" +
+                        "       <ons-col></ons-col>" +
+                        "   </ons-row>" +
+                        "   <ons-row>" +
+                        "       <ons-col></ons-col>" +
+                        "       <ons-col vertical-align='center' width='100px'>Duration</ons-col>" +
+                        "       <ons-col vertical-align='center' width='150px'>" + durationHours + ":" + formatTwoDigitNumber(durationMinutes) + ":" + formatTwoDigitNumber(durationSeconds) + "</ons-col>" +
+                        "       <ons-col></ons-col>" +
+                        "   </ons-row>"+
+                        "   <ons-row>" +
+                        "       <ons-col></ons-col>" +
+                        "       <ons-col vertical-align='center' width='100px'>Area</ons-col>" +
+                        "       <ons-col vertical-align='center' width='150px'>" + area + " m<sup>2</sup></ons-col>" +
+                        "       <ons-col></ons-col>" +
+                        "   </ons-row>"+
+                        "   <ons-row>" +
+                        "       <ons-col></ons-col>" +
+                        "       <ons-col vertical-align='center' width='100px'>Completed</ons-col>" +
+                        "       <ons-col vertical-align='center' width='150px'>" + (completedFlag?"<ons-icon icon='fa-check-circle' style='color:green;'>":"<ons-icon icon='fa-times-circle' style='color:red;'>") + "</ons-col>" +
+                        "       <ons-col></ons-col>" +
+                        "   </ons-row>"+
+                        (errorCode>0?
+                        "   <ons-row>" +
+                        "       <ons-col></ons-col>" +
+                        "       <ons-col vertical-align='center' width='400px' style='text-align:center;'><ons-icon icon='fa-warning' style='color:red;'></ons-icon>&nbsp;" + errorDescription + " (Code: " + errorCode + ")</ons-col>" +
+                        "       <ons-col></ons-col>" +
+                        "   </ons-row>"
+                        : "" ) +
+                        "</ons-list-item>"));
+                    //load next element
+                    loadNextRemainingElements();
+                }, (err) => ons.notification.toast(err, { buttonLabel: 'Dismiss', timeout: window.fn.toastErrorTimeout }))
+                .finally(() => loadingBarSettingsCleaningHistory.removeAttribute("indeterminate"));
             } else {
                 if (historyArray.length>0) {
                     //show link to load more
@@ -163,7 +154,7 @@
                     });
                 } else if (res && res[0] === "map_upload_handler") {
                     if (mapDataCached) {
-                        // the thing is when this is reply to the first request then map snapshot isn't actually being sent it seems
+                        // the thing is when this reply is received after the first request then map snapshot isn't actually being sent it seems
                         fn.pushPage({
                             'id': 'settings-cleaning-history-map.html',
                             'title': 'Cleaning history map',
@@ -194,7 +185,9 @@
                     }
                 });
             }, (err) => { throw err; })
-            .catch((err) => ons.notification.toast(err, { buttonLabel: 'Dismiss', timeout: window.fn.toastErrorTimeout }))
+            .catch((err) => {
+                if (err !== "ok") ons.notification.toast(err, { buttonLabel: 'Dismiss', timeout: window.fn.toastErrorTimeout });
+            })
             .finally(() => loadingBarSettingsCleaningHistory.removeAttribute("indeterminate"));
         };
     </script>
diff --git a/client/settings-consumables.html b/client/settings-consumables.html
index 8a90081e..2c28043a 100644
--- a/client/settings-consumables.html
+++ b/client/settings-consumables.html
@@ -105,37 +105,31 @@
             ons.notification.confirm('Do you really want to reset this consumable?').then(function (answer) {
                 if (answer === 1) {
                     loadingBarSettingsConsumables.setAttribute("indeterminate", "indeterminate");
-
-                    fn.requestWithPayload("api/reset_consumable", JSON.stringify({ consumable: consumable }), "PUT", function (err, res) {
-                        if (err) {
-                            loadingBarSettingsConsumables.removeAttribute("indeterminate");
-                            ons.notification.toast(err, { buttonLabel: 'Dismiss', timeout: window.fn.toastErrorTimeout })
-                        } else {
-                            updateSettingsConsumablesPage();
-                        }
-                    })
+                    fn.prequestWithPayload("api/reset_consumable", JSON.stringify({ consumable: consumable }), "PUT")
+                    .then(
+                        (res) => updateSettingsConsumablesPage(),
+                        (err) => ons.notification.toast(err, { buttonLabel: 'Dismiss', timeout: window.fn.toastErrorTimeout })
+                    )
+                    .finally(() => loadingBarSettingsConsumables.removeAttribute("indeterminate"));
                 }
             });
-        }
+        };
 
         function updateSettingsConsumablesPage() {
             loadingBarSettingsConsumables.setAttribute("indeterminate", "indeterminate");
-            fn.request("api/consumable_status", "GET", function (err, res) {
-                loadingBarSettingsConsumables.removeAttribute("indeterminate");
-                if (!err) {
-                    consumableMainBrushStatus.innerHTML = (Math.max(0, 300 - (res.consumables.main_brush_work_time / 60 / 60))).toFixed(1) + " hours left";
-                    consumableSideBrushStatus.innerHTML = (Math.max(0, 200 - (res.consumables.side_brush_work_time / 60 / 60))).toFixed(1) + " hours left";
-                    consumableFilterStatus.innerHTML = (Math.max(0, 150 - (res.consumables.filter_work_time / 60 / 60))).toFixed(1) + " hours left";
-                    consumableSensorStatus.innerHTML = (Math.max(0, 30 - (res.consumables.sensor_dirty_time / 60 / 60))).toFixed(1) + " hours left";
+            fn.prequest("api/consumable_status", "GET")
+            .then((res) => {
+                consumableMainBrushStatus.innerHTML = (Math.max(0, 300 - (res.consumables.main_brush_work_time / 60 / 60))).toFixed(1) + " hours left";
+                consumableSideBrushStatus.innerHTML = (Math.max(0, 200 - (res.consumables.side_brush_work_time / 60 / 60))).toFixed(1) + " hours left";
+                consumableFilterStatus.innerHTML = (Math.max(0, 150 - (res.consumables.filter_work_time / 60 / 60))).toFixed(1) + " hours left";
+                consumableSensorStatus.innerHTML = (Math.max(0, 30 - (res.consumables.sensor_dirty_time / 60 / 60))).toFixed(1) + " hours left";
 
-                    consumableStatisticsArea.innerHTML = (res.summary[1] / 1000000).toFixed(1) + " m²";
-                    consumableStatisticsHours.innerHTML = (res.summary[0] / 60 / 60).toFixed(1) + " hours";
-                    consumableStatisticsCount.innerHTML = res.summary[2];
-                } else {
-                    ons.notification.toast(err, { buttonLabel: 'Dismiss', timeout: window.fn.toastErrorTimeout })
-                }
-            });
-        }
+                consumableStatisticsArea.innerHTML = (res.summary[1] / 1000000).toFixed(1) + " m²";
+                consumableStatisticsHours.innerHTML = (res.summary[0] / 60 / 60).toFixed(1) + " hours";
+                consumableStatisticsCount.innerHTML = res.summary[2];
+            }, (err) => ons.notification.toast(err, { buttonLabel: 'Dismiss', timeout: window.fn.toastErrorTimeout }))
+            .finally(() => loadingBarSettingsConsumables.removeAttribute("indeterminate"));
+        };
     </script>
     <style>
         #consumables-list .consumables-list-item-title {
diff --git a/client/settings-info.html b/client/settings-info.html
index e41d6c7f..637561e0 100644
--- a/client/settings-info.html
+++ b/client/settings-info.html
@@ -117,56 +117,47 @@
         };
         function updateSettingsInfoPage() {
             loadingBarSettingsInfo.setAttribute("indeterminate", "indeterminate");
-            fn.request("api/get_fw_version", "GET", function (err, res) {
-                loadingBarSettingsInfo.removeAttribute("indeterminate");
-                if (!err) {
-                    document.getElementById('info_fw_version').innerHTML = res.version;
-                    document.getElementById('info_fw_build').innerHTML = res.build;
-                    document.getElementById('info_valetudo_version').innerHTML = res.valetudoVersion;
-                } else {
-                    ons.notification.toast(err, { buttonLabel: 'Dismiss', timeout: window.fn.toastErrorTimeout })
-                }
+            fn.prequest("api/get_fw_version", "GET")
+            .then((res) => {
+                document.getElementById('info_fw_version').innerHTML = res.version;
+                document.getElementById('info_fw_build').innerHTML = res.build;
+                document.getElementById('info_valetudo_version').innerHTML = res.valetudoVersion;
                 updateAppLocale();
-            });
+            }, (err) => ons.notification.toast(err, { buttonLabel: 'Dismiss', timeout: window.fn.toastErrorTimeout }))
+            .finally(() => loadingBarSettingsInfo.removeAttribute("indeterminate"));
         }
         function updateAppLocale() {
             loadingBarSettingsInfo.setAttribute("indeterminate", "indeterminate");
-            fn.request("api/get_app_locale", "GET", function (err, res) {
-                loadingBarSettingsInfo.removeAttribute("indeterminate");
-                if (!err) {
-                    var appLocale = res[0];
-                    document.getElementById('app_locale_name').innerHTML = appLocale.name;
-                    document.getElementById('app_locale_bom').innerHTML = appLocale.bom;
-                    document.getElementById('app_locale_location').innerHTML = appLocale.location;
-                    document.getElementById('app_locale_language').innerHTML = appLocale.language;
-                    document.getElementById('app_locale_timezone').innerHTML = appLocale.timezone;
-                    document.getElementById('app_locale_logserver').innerHTML = appLocale.logserver;
-                } else {
-                    ons.notification.toast(err, { buttonLabel: 'Dismiss', timeout: window.fn.toastErrorTimeout })
-                }
-            });
+            fn.prequest("api/get_app_locale", "GET")
+            .then((res) => {
+                var appLocale = res[0];
+                document.getElementById('app_locale_name').innerHTML = appLocale.name;
+                document.getElementById('app_locale_bom').innerHTML = appLocale.bom;
+                document.getElementById('app_locale_location').innerHTML = appLocale.location;
+                document.getElementById('app_locale_language').innerHTML = appLocale.language;
+                document.getElementById('app_locale_timezone').innerHTML = appLocale.timezone;
+                document.getElementById('app_locale_logserver').innerHTML = appLocale.logserver;
+            }, (err) => ons.notification.toast(err, { buttonLabel: 'Dismiss', timeout: window.fn.toastErrorTimeout }))
+            .finally(() => loadingBarSettingsInfo.removeAttribute("indeterminate"));
         }
 
         function checkNewValetudoVersion() {
             loadingBarSettingsInfo.setAttribute("indeterminate", "indeterminate");
-            fn.request("https://api.github.com/repos/rand256/valetudo/releases", "GET", function (err, res) {
-                loadingBarSettingsInfo.removeAttribute("indeterminate");
-                if (!err) {
-                    try {
-                        var info_valetudo_newest_release = res[0];
-                        document.getElementById('info_newest_valetudo_version').innerHTML = info_valetudo_newest_release.tag_name;
-                        document.getElementById('info_valetudo_update_url').innerHTML = '<a href="'+info_valetudo_newest_release.html_url+'">'+info_valetudo_newest_release.html_url+'</a>';
-                        if( document.getElementById('info_valetudo_version').innerHTML != info_valetudo_newest_release.tag_name)
-                        {
-                                document.getElementById('info_valetudo_update_url_list').style.display = ""; //make entry visible if newer version is availiable
-                        }
-                    } catch (e) {
-                        ons.notification.toast(e, { buttonLabel: 'Dismiss', timeout: 1500 });
+            fn.prequest("https://api.github.com/repos/rand256/valetudo/releases", "GET")
+            .then((res) => {
+                try {
+                    var info_valetudo_newest_release = res[0];
+                    document.getElementById('info_newest_valetudo_version').innerHTML = info_valetudo_newest_release.tag_name;
+                    document.getElementById('info_valetudo_update_url').innerHTML = '<a href="'+info_valetudo_newest_release.html_url+'">'+info_valetudo_newest_release.html_url+'</a>';
+                    if( document.getElementById('info_valetudo_version').innerHTML != info_valetudo_newest_release.tag_name)
+                    {
+                            document.getElementById('info_valetudo_update_url_list').style.display = ""; //make entry visible if newer version is availiable
                     }
-                } else {
-                    ons.notification.toast(err, { buttonLabel: 'Dismiss', timeout: 1500 });
+                } catch (e) {
+                    ons.notification.toast(e, { buttonLabel: 'Dismiss', timeout: 1500 });
                 }
-            });
+            }, (err) => ons.notification.toast(err, { buttonLabel: 'Dismiss', timeout: window.fn.toastErrorTimeout }))
+            .finally(() => loadingBarSettingsInfo.removeAttribute("indeterminate"));
         }
     </script>
 </ons-page>
\ No newline at end of file
diff --git a/client/settings-persistent-data.html b/client/settings-persistent-data.html
index 21c1a248..15d0bfdc 100644
--- a/client/settings-persistent-data.html
+++ b/client/settings-persistent-data.html
@@ -116,56 +116,48 @@
             } else {
                 resetMapButton.removeAttribute("disabled");
             }
-        }
+        };
 
         function initForm(currentStatus) {
             var persistentDataForm = document.getElementById('persistent_data_form');
             document.getElementById('lab_mode_enabled').checked = (currentStatus.lab_status === 1);
             disableResetMap(currentStatus.lab_status !== 1);
-        }
+        };
 
         function updateSettingsPersistentDataPage() {
             loadingBarSettingsPersistentData.setAttribute("indeterminate", "indeterminate");
-            fn.request("api/current_status", "GET", function (err, res) {
-                loadingBarSettingsPersistentData.removeAttribute("indeterminate");
-                if (err) {
-                    ons.notification.toast(err, { buttonLabel: 'Dismiss', timeout: window.fn.toastErrorTimeout })
+            fn.prequest("api/current_status", "GET")
+            .then((res) => {
+                const isS50 = res.model === "roborock.vacuum.s5"; //TODO: Magic string
+                if(isS50) {
+                    document.getElementById('persistent_data_form').classList.remove("hidden");
+                    initForm(res);
                 } else {
-                    const isS50 = res.model === "roborock.vacuum.s5"; //TODO: Magic string
-                    if(isS50) {
-                        document.getElementById('persistent_data_form').classList.remove("hidden");
-                        initForm(res);
-                    } else {
-                        document.getElementById('persistent_data_not_supported').classList.remove("hidden");
-                    }
+                    document.getElementById('persistent_data_not_supported').classList.remove("hidden");
                 }
-            })
-        }
+            }, (err) => ons.notification.toast(err, { buttonLabel: 'Dismiss', timeout: window.fn.toastErrorTimeout }))
+            .finally(() => loadingBarSettingsPersistentData.removeAttribute("indeterminate"));
+        };
 
         function resetMap() {
             loadingBarSettingsPersistentData.setAttribute("indeterminate", "indeterminate");
-            fn.request("api/reset_map", "PUT", function (err, res) {
-                loadingBarSettingsPersistentData.removeAttribute("indeterminate");
-                if (err) {
-                    ons.notification.toast(err, { buttonLabel: 'Dismiss', timeout: window.fn.toastErrorTimeout });
-                } else {
-                    ons.notification.toast("Map resetted!", { buttonLabel: 'Dismiss', timeout: window.fn.toastOKTimeout });
-                }
-            });
-        }
+            fn.prequest("api/reset_map", "PUT")
+            .then(
+                (res) => ons.notification.toast("Map resetted!", { buttonLabel: 'Dismiss', timeout: window.fn.toastOKTimeout }),
+                (err) => ons.notification.toast(err, { buttonLabel: 'Dismiss', timeout: window.fn.toastErrorTimeout })
+            )
+            .finally(() => loadingBarSettingsPersistentData.removeAttribute("indeterminate"));
+        };
 
         function savePersistentData() {
             const labStatus = true === document.getElementById('lab_mode_enabled').checked;
-
             loadingBarSettingsPersistentData.setAttribute("indeterminate", "indeterminate");
-            fn.requestWithPayload("api/set_lab_status", JSON.stringify({ lab_status: labStatus }), "PUT", function (err, res) {
-                loadingBarSettingsPersistentData.removeAttribute("indeterminate");
-                if (err) {
-                    ons.notification.toast(err, { buttonLabel: 'Dismiss', timeout: window.fn.toastErrorTimeout });
-                } else {
-                    ons.notification.toast("Saved settings!", { buttonLabel: 'Dismiss', timeout: window.fn.toastOKTimeout });
-                }
-            });
-        }
+            fn.prequestWithPayload("api/set_lab_status", JSON.stringify({ lab_status: labStatus }), "PUT")
+            .then(
+                (res) => ons.notification.toast("Saved settings!", { buttonLabel: 'Dismiss', timeout: window.fn.toastOKTimeout }),
+                (err) => ons.notification.toast(err, { buttonLabel: 'Dismiss', timeout: window.fn.toastErrorTimeout })
+            )
+            .finally(() => loadingBarSettingsPersistentData.removeAttribute("indeterminate"));
+        };
     </script>
 </ons-page>
\ No newline at end of file
diff --git a/client/settings-sound-voice.html b/client/settings-sound-voice.html
index 0bf26f1e..83d3174d 100644
--- a/client/settings-sound-voice.html
+++ b/client/settings-sound-voice.html
@@ -74,15 +74,13 @@
 
         function updateSettingsSoundVolumePage() {
             loadingBarSettingsSoundVolume.setAttribute("indeterminate", "indeterminate");
-            fn.request("api/get_sound_volume", "GET", function (err, res) {
-                loadingBarSettingsSoundVolume.removeAttribute("indeterminate");
-                if (!err) {
-                    soundVolumeInputVolume.value = res;
-                } else {
-                    ons.notification.toast(err, { buttonLabel: 'Dismiss', timeout: window.fn.toastErrorTimeout })
-                }
-            });
-        }
+            fn.prequest("api/get_sound_volume", "GET")
+            .then(
+                (res) => { soundVolumeInputVolume.value = res; },
+                (err) => ons.notification.toast(err, { buttonLabel: 'Dismiss', timeout: window.fn.toastErrorTimeout })
+            )
+            .finally(() => loadingBarSettingsSoundVolume.removeAttribute("indeterminate"));
+        };
 
         function updateSoundVolumeSaveButton() {
             if (soundVolumeInputVolume.value && soundVolumeInputVolume.value !== "") {
@@ -90,31 +88,26 @@
             } else {
                 soundVolumeInputSaveButton.setAttribute("disabled", "disabled");
             }
-        }
+        };
 
         function handleSoundVolumeSettingsSaveButton() {
             loadingBarSettingsSoundVolume.setAttribute("indeterminate", "indeterminate");
-
-            fn.requestWithPayload("api/set_sound_volume", JSON.stringify({
+            fn.prequestWithPayload("api/set_sound_volume", JSON.stringify({
                  volume: soundVolumeInputVolume.value
-            }), "PUT", function (err) {
-                 if (err) {
-                       ons.notification.toast(err, { buttonLabel: 'Dismiss', timeout: window.fn.toastErrorTimeout })
-                    }
-                loadingBarSettingsSoundVolume.removeAttribute("indeterminate");
-            });
-        }
+            }), "PUT")
+            .then(
+                (res) => ons.notification.toast("Volume successfully saved.", { buttonLabel: 'Dismiss', timeout: window.fn.toastOKTimeout }),
+                (err) => ons.notification.toast(err, { buttonLabel: 'Dismiss', timeout: window.fn.toastErrorTimeout })
+            )
+            .finally(() => loadingBarSettingsSoundVolume.removeAttribute("indeterminate"));
+        };
 
         function handleSoundVolumeSettingsTestButton() {
             loadingBarSettingsSoundVolume.setAttribute("indeterminate", "indeterminate");
-
-            fn.request("api/test_sound_volume", "PUT", function (err, res) {
-                loadingBarSettingsSoundVolume.removeAttribute("indeterminate");
-                if (err) {
-                    ons.notification.toast(err, { buttonLabel: 'Dismiss', timeout: window.fn.toastErrorTimeout })
-                }
-            });
-        }
+            fn.prequest("api/test_sound_volume", "PUT")
+            .then(null, (err) => ons.notification.toast(err, { buttonLabel: 'Dismiss', timeout: window.fn.toastErrorTimeout }))
+            .finally(() => loadingBarSettingsSoundVolume.removeAttribute("indeterminate"));
+        };
 
         voiceUploadForm.onsubmit = function(event){
             event.preventDefault();
@@ -129,49 +122,43 @@
                 fn.postFile("api/install_voice_pack", file, function (p){
                     loadingBarSettingsSoundVolume.value = (p * 0.9);
                 }, function (err, res){
-                    if(err){
+                    if (err) {
                         ons.notification.toast(err, { buttonLabel: 'Dismiss', timeout: window.fn.toastErrorTimeout });
                         voicePackUploadButton.innerText = uploadText;
                         voicePackUploadButton.disabled = false;
                         loadingBarSettingsSoundVolume.value = 0;
-                    }else{
+                    } else {
                         voicePackUploadButton.innerText = 'Installing voice pack...';
-                        getVoicePackInstallStatus(function(err, data){
-                            if(!err){
-                                loadingBarSettingsSoundVolume.value = 90 + (data.progress * 0.1);
-
-                                if(data.progress == 100 || data.error != 0){
-                                    if(data.error != 0){
-                                        ons.notification.toast("Failed to install voice pack.", { buttonLabel: 'Dismiss', timeout: window.fn.toastErrorTimeout });
-                                    }else{
-                                        ons.notification.toast("Voice pack was successfully installed.", { buttonLabel: 'Dismiss', timeout: window.fn.toastOKTimeout });
-                                    }
-                                    voicePackUploadButton.innerText = uploadText;
-                                    voicePackUploadButton.disabled = false;
-                                    loadingBarSettingsSoundVolume.value = 0;
-                                }
-                            }else{
-                                voicePackUploadButton.innerText = uploadText;
-                                voicePackUploadButton.disabled = false;
-                                loadingBarSettingsSoundVolume.value = 0;
-                            }
-                        });
+                        getVoicePackInstallStatus();
                     }
                 });
             }
-        }
+        };
 
-        function getVoicePackInstallStatus(callback){
+        function getVoicePackInstallStatus(){
             setTimeout(function(){
-                fn.request("api/install_voice_pack_status", "GET", function (err, res) {
-                    callback(err, res);
-                    if(!err){
-                        if(res.progress != 100 && res.error == 0){
-                            getVoicePackInstallStatus(callback);
+                fn.prequest("api/install_voice_pack_status", "GET")
+                .then((res) => {
+                    loadingBarSettingsSoundVolume.value = 90 + (res.progress * 0.1);
+                    if (res.progress == 100 || res.error != 0) {
+                        if (res.error != 0){
+                            ons.notification.toast("Failed to install voice pack.", { buttonLabel: 'Dismiss', timeout: window.fn.toastErrorTimeout });
+                        } else {
+                            ons.notification.toast("Voice pack was successfully installed.", { buttonLabel: 'Dismiss', timeout: window.fn.toastOKTimeout });
                         }
+                        voicePackUploadButton.innerText = uploadText;
+                        voicePackUploadButton.disabled = false;
+                        loadingBarSettingsSoundVolume.value = 0;
                     }
+                    if (res.progress != 100 && res.error == 0) {
+                        getVoicePackInstallStatus();
+                    }
+                },(err) => {
+                    voicePackUploadButton.innerText = uploadText;
+                    voicePackUploadButton.disabled = false;
+                    loadingBarSettingsSoundVolume.value = 0;
                 });
             }, 1000);
-        }
+        };
     </script>
 </ons-page>
\ No newline at end of file
diff --git a/client/settings-timers.html b/client/settings-timers.html
index bfb16ea4..715f284d 100644
--- a/client/settings-timers.html
+++ b/client/settings-timers.html
@@ -216,7 +216,7 @@
         document.querySelector("#settings-timers-page ons-back-button").onClick = () => fn.popPage(); // case matters!
 
         ons.getScriptPage().onShow = function () {
-            updateSettingsZonedTimersPage();
+            updateSettingsTimersPage(true);
             updateSettingsTimersPage();
             updateDndTimerPage();
         };
@@ -224,132 +224,124 @@
         function addZoneCoordinates() {
             addZoneCoordinatesButton.disabled = true;
             loadingBarSettingsTimers.setAttribute("indeterminate", "indeterminate");
-            const getZones = fetch("api/zones")
-                .then(res => res.json())
-                .then(res => {
-                    let zones = res;
+            fn.prequest("api/zones", "GET")
+            .then((res) => {
+                let zones = res;
 
-                    let options = []
-                    for (var i = 0; i < zones.length; i++){
-                        options.push(zones[i].name);
-                    }
-                    options.push({
-                        label: 'Cancel',
-                        icon: 'md-close'
-                    });
-                    ons.openActionSheet({
-                        title: 'Choose a zone',
-                        cancelable: true,
-                        buttons: options
-                    }).then(function (index) {
-                        if(index > -1 && index < zones.length) {
-                            let coords = [], coordInputs = document.querySelectorAll("#add-zoned-timer-form input[name='zoned_timer_coords[]']");
-                            if (coordInputs.length) {
-                                coords = Array.from(coordInputs).map(a => JSON.parse(a.value)).reduce((acc, val) => acc.concat(val), []);
-                            }
-                            coords = coords.concat(zones[index].coordinates);
-                            if (coords.length > 5) {
-                                ons.notification.alert('You can\'t use more than 5 zones in one cleaning session.', { buttonLabel: 'Dismiss', timeout: window.fn.toastErrorTimeout });
-                                return;
-                            }
-                            let anchor = document.querySelector('#add-zoned-timer-form > hr');
-                            anchor.parentNode.insertBefore(ons.createElement(
-                                '<ons-row><ons-col width="100px" align="center" style="overflow-x: hidden; text-overflow: ellipsis; white-space: nowrap; cursor: pointer; color: darkgrey;" onclick="removeTimerZone(this);">[x] (' + zones[index].coordinates.length + ' zone' + (zones[index].coordinates.length > 1 ? 's' : '') + ')</ons-col><ons-col><ons-input type="hidden" name="zoned_timer_coords[]" value="' + JSON.stringify(zones[index].coordinates) + '" disabled>' + zones[index].name + '</ons-col></ons-row>'
-                            ),anchor);
+                let options = []
+                for (var i = 0; i < zones.length; i++){
+                    options.push(zones[i].name);
+                }
+                options.push({
+                    label: 'Cancel',
+                    icon: 'md-close'
+                });
+                ons.openActionSheet({
+                    title: 'Choose a zone',
+                    cancelable: true,
+                    buttons: options
+                }).then(function (index) {
+                    if(index > -1 && index < zones.length) {
+                        let coords = [], coordInputs = document.querySelectorAll("#add-zoned-timer-form input[name='zoned_timer_coords[]']");
+                        if (coordInputs.length) {
+                            coords = Array.from(coordInputs).map(a => JSON.parse(a.value)).reduce((acc, val) => acc.concat(val), []);
                         }
-                    })
-                })
-                .catch(err => {
-                    console.error(err);
-                    ons.notification.toast(err, { buttonLabel: 'Dismiss', timeout: window.fn.toastErrorTimeout });
-                })
-                .finally(() => {
-                    loadingBarSettingsTimers.removeAttribute("indeterminate");
-                    addZoneCoordinatesButton.disabled = false;
+                        coords = coords.concat(zones[index].coordinates);
+                        if (coords.length > 5) {
+                            ons.notification.alert('You can\'t use more than 5 zones in one cleaning session.', { buttonLabel: 'Dismiss', timeout: window.fn.toastErrorTimeout });
+                            return;
+                        }
+                        let anchor = document.querySelector('#add-zoned-timer-form > hr');
+                        anchor.parentNode.insertBefore(ons.createElement(
+                            '<ons-row><ons-col width="100px" align="center" style="overflow-x: hidden; text-overflow: ellipsis; white-space: nowrap; cursor: pointer; color: darkgrey;" onclick="removeTimerZone(this);">[x] (' + zones[index].coordinates.length + ' zone' + (zones[index].coordinates.length > 1 ? 's' : '') + ')</ons-col><ons-col><ons-input type="hidden" name="zoned_timer_coords[]" value="' + JSON.stringify(zones[index].coordinates) + '" disabled>' + zones[index].name + '</ons-col></ons-row>'
+                        ),anchor);
+                    }
                 });
-        }
+            },(err) => ons.notification.toast(err, { buttonLabel: 'Dismiss', timeout: window.fn.toastErrorTimeout }))
+            .finally(() => {
+                loadingBarSettingsTimers.removeAttribute("indeterminate");
+                addZoneCoordinatesButton.disabled = false;
+            });
+        };
 
         function removeTimerZone(elem) {
             elem.parentNode.parentNode.removeChild(elem.parentNode);
-        }
+        };
 
         function showTimeZoneDialog() {
             loadingBarSettingsTimers.setAttribute("indeterminate", "indeterminate");
-            fn.request("api/get_timezone", "GET", function (err, currentTimeZone) {
-                loadingBarSettingsTimers.removeAttribute("indeterminate");
-                if (!err) {
-                    var timeZoneSelection = document.getElementById('timezone-selection');
-                    if (timeZoneSelection.childElementCount  == 0) {
-                        //initialize select options only if not already done
-                        //TODO: Those timezones should be outsourced to a config file
-                        var allTimezones =['Africa/Abidjan', 'Africa/Accra', 'Africa/Algiers', 'Africa/Bissau', 'Africa/Cairo', 'Africa/Casablanca', 'Africa/Ceuta', 'Africa/El_Aaiun','Africa/Johannesburg',
-                        'Africa/Juba', 'Africa/Khartoum', 'Africa/Lagos', 'Africa/Maputo', 'Africa/Monrovia', 'Africa/Nairobi', 'Africa/Ndjamena', 'Africa/Sao_Tome', 'Africa/Tripoli', 'Africa/Tunis',
-                        'Africa/Windhoek', 'America/Adak', 'America/Anchorage', 'America/Araguaina', 'America/Argentina/Buenos_Aires', 'America/Argentina/Catamarca', 'America/Argentina/Cordoba',
-                        'America/Argentina/Jujuy', 'America/Argentina/La_Rioja', 'America/Argentina/Mendoza', 'America/Argentina/Rio_Gallegos', 'America/Argentina/Salta', 'America/Argentina/San_Juan',
-                        'America/Argentina/San_Luis', 'America/Argentina/Tucuman', 'America/Argentina/Ushuaia', 'America/Asuncion', 'America/Atikokan', 'America/Bahia', 'America/Bahia_Banderas',
-                        'America/Barbados', 'America/Belem', 'America/Belize', 'America/Blanc-Sablon', 'America/Boa_Vista', 'America/Bogota', 'America/Boise', 'America/Cambridge_Bay', 'America/Campo_Grande',
-                        'America/Cancun', 'America/Caracas', 'America/Cayenne', 'America/Chicago', 'America/Chihuahua', 'America/Costa_Rica', 'America/Creston', 'America/Cuiaba', 'America/Curacao',
-                        'America/Danmarkshavn', 'America/Dawson', 'America/Dawson_Creek', 'America/Denver', 'America/Detroit', 'America/Edmonton', 'America/Eirunepe', 'America/El_Salvador', 'America/Fortaleza',
-                        'America/Fort_Nelson', 'America/Glace_Bay', 'America/Godthab', 'America/Goose_Bay', 'America/Grand_Turk', 'America/Guatemala', 'America/Guayaquil', 'America/Guyana', 'America/Halifax',
-                        'America/Havana', 'America/Hermosillo', 'America/Indiana/Indianapolis', 'America/Indiana/Knox', 'America/Indiana/Marengo', 'America/Indiana/Petersburg', 'America/Indiana/Tell_City',
-                        'America/Indiana/Vevay', 'America/Indiana/Vincennes', 'America/Indiana/Winamac', 'America/Inuvik', 'America/Iqaluit', 'America/Jamaica', 'America/Juneau', 'America/Kentucky/Louisville',
-                        'America/Kentucky/Monticello', 'America/La_Paz', 'America/Lima', 'America/Los_Angeles', 'America/Maceio', 'America/Managua', 'America/Manaus', 'America/Martinique', 'America/Matamoros',
-                        'America/Mazatlan', 'America/Menominee', 'America/Merida', 'America/Metlakatla', 'America/Mexico_City', 'America/Miquelon', 'America/Moncton', 'America/Monterrey', 'America/Montevideo',
-                        'America/Nassau', 'America/New_York', 'America/Nipigon', 'America/Nome', 'America/Noronha', 'America/North_Dakota/Beulah', 'America/North_Dakota/Center', 'America/North_Dakota/New_Salem',
-                        'America/Ojinaga', 'America/Panama', 'America/Pangnirtung', 'America/Paramaribo', 'America/Phoenix', 'America/Port-au-Prince', 'America/Porto_Velho', 'America/Port_of_Spain',
-                        'America/Puerto_Rico', 'America/Punta_Arenas', 'America/Rainy_River', 'America/Rankin_Inlet', 'America/Recife', 'America/Regina', 'America/Resolute', 'America/Rio_Branco',
-                        'America/Santarem', 'America/Santiago', 'America/Santo_Domingo', 'America/Sao_Paulo', 'America/Scoresbysund', 'America/Sitka', 'America/St_Johns', 'America/Swift_Current',
-                        'America/Tegucigalpa', 'America/Thule', 'America/Thunder_Bay', 'America/Tijuana', 'America/Toronto', 'America/Vancouver', 'America/Whitehorse', 'America/Winnipeg', 'America/Yakutat',
-                        'America/Yellowknife', 'Antarctica/Casey', 'Antarctica/Davis', 'Antarctica/DumontDUrville', 'Antarctica/Macquarie', 'Antarctica/Mawson', 'Antarctica/Palmer', 'Antarctica/Rothera',
-                        'Antarctica/Syowa', 'Antarctica/Troll', 'Antarctica/Vostok', 'Asia/Almaty', 'Asia/Amman', 'Asia/Anadyr', 'Asia/Aqtau', 'Asia/Aqtobe', 'Asia/Ashgabat', 'Asia/Atyrau', 'Asia/Baghdad',
-                        'Asia/Baku', 'Asia/Bangkok', 'Asia/Barnaul', 'Asia/Beirut', 'Asia/Bishkek', 'Asia/Brunei', 'Asia/Chita', 'Asia/Choibalsan', 'Asia/Colombo', 'Asia/Damascus', 'Asia/Dhaka', 'Asia/Dili',
-                        'Asia/Dubai', 'Asia/Dushanbe', 'Asia/Famagusta', 'Asia/Gaza', 'Asia/Hebron', 'Asia/Hong_Kong', 'Asia/Hovd', 'Asia/Ho_Chi_Minh', 'Asia/Irkutsk', 'Asia/Jakarta', 'Asia/Jayapura',
-                        'Asia/Jerusalem', 'Asia/Kabul', 'Asia/Kamchatka', 'Asia/Karachi', 'Asia/Kathmandu', 'Asia/Khandyga', 'Asia/Kolkata', 'Asia/Krasnoyarsk', 'Asia/Kuala_Lumpur', 'Asia/Kuching', 'Asia/Macau',
-                        'Asia/Magadan', 'Asia/Makassar', 'Asia/Manila', 'Asia/Nicosia', 'Asia/Novokuznetsk', 'Asia/Novosibirsk', 'Asia/Omsk', 'Asia/Oral', 'Asia/Pontianak', 'Asia/Pyongyang', 'Asia/Qatar',
-                        'Asia/Qostanay', 'Asia/Qyzylorda', 'Asia/Riyadh', 'Asia/Sakhalin', 'Asia/Samarkand', 'Asia/Seoul', 'Asia/Shanghai', 'Asia/Singapore', 'Asia/Srednekolymsk', 'Asia/Taipei', 'Asia/Tashkent',
-                        'Asia/Tbilisi', 'Asia/Tehran', 'Asia/Thimphu', 'Asia/Tokyo', 'Asia/Tomsk', 'Asia/Ulaanbaatar', 'Asia/Urumqi', 'Asia/Ust-Nera', 'Asia/Vladivostok', 'Asia/Yakutsk', 'Asia/Yangon',
-                        'Asia/Yekaterinburg', 'Asia/Yerevan', 'Atlantic/Azores', 'Atlantic/Bermuda', 'Atlantic/Canary', 'Atlantic/Cape_Verde', 'Atlantic/Faroe', 'Atlantic/Madeira', 'Atlantic/Reykjavik',
-                        'Atlantic/South_Georgia', 'Atlantic/Stanley', 'Australia/Adelaide', 'Australia/Brisbane', 'Australia/Broken_Hill', 'Australia/Currie', 'Australia/Darwin', 'Australia/Eucla',
-                        'Australia/Hobart', 'Australia/Lindeman', 'Australia/Lord_Howe', 'Australia/Melbourne', 'Australia/Perth', 'Australia/Sydney', 'Europe/Amsterdam','Europe/Andorra', 'Europe/Astrakhan',
-                        'Europe/Athens', 'Europe/Belgrade', 'Europe/Berlin', 'Europe/Brussels', 'Europe/Bucharest', 'Europe/Budapest', 'Europe/Chisinau', 'Europe/Copenhagen', 'Europe/Dublin', 'Europe/Gibraltar',
-                        'Europe/Helsinki', 'Europe/Istanbul', 'Europe/Kaliningrad', 'Europe/Kiev', 'Europe/Kirov', 'Europe/Lisbon', 'Europe/London', 'Europe/Luxembourg', 'Europe/Madrid', 'Europe/Malta',
-                        'Europe/Minsk', 'Europe/Monaco', 'Europe/Moscow', 'Europe/Oslo', 'Europe/Paris', 'Europe/Prague', 'Europe/Riga', 'Europe/Rome', 'Europe/Samara', 'Europe/Saratov', 'Europe/Simferopol',
-                        'Europe/Sofia', 'Europe/Stockholm', 'Europe/Tallinn', 'Europe/Tirane', 'Europe/Ulyanovsk', 'Europe/Uzhgorod', 'Europe/Vienna', 'Europe/Vilnius', 'Europe/Volgograd', 'Europe/Warsaw',
-                        'Europe/Zaporozhye', 'Europe/Zurich', 'Indian/Chagos', 'Indian/Christmas', 'Indian/Cocos', 'Indian/Kerguelen', 'Indian/Mahe', 'Indian/Maldives', 'Indian/Mauritius', 'Indian/Reunion',
-                        'Pacific/Apia', 'Pacific/Auckland', 'Pacific/Bougainville', 'Pacific/Chatham', 'Pacific/Chuuk', 'Pacific/Easter', 'Pacific/Efate', 'Pacific/Enderbury', 'Pacific/Fakaofo', 'Pacific/Fiji',
-                        'Pacific/Funafuti', 'Pacific/Galapagos', 'Pacific/Gambier', 'Pacific/Guadalcanal', 'Pacific/Guam', 'Pacific/Honolulu', 'Pacific/Kiritimati', 'Pacific/Kosrae', 'Pacific/Kwajalein',
-                        'Pacific/Majuro', 'Pacific/Marquesas', 'Pacific/Nauru', 'Pacific/Niue', 'Pacific/Norfolk', 'Pacific/Noumea', 'Pacific/Pago_Pago', 'Pacific/Palau', 'Pacific/Pitcairn', 'Pacific/Pohnpei',
-                        'Pacific/Port_Moresby', 'Pacific/Rarotonga', 'Pacific/Tahiti', 'Pacific/Tarawa', 'Pacific/Tongatapu', 'Pacific/Wake', 'Pacific/Wallis'];
-                        allTimezones.forEach(function (tmpTimeZone) {
-                            var tmpOption = document.createElement("option");
-                            tmpOption.innerText = tmpTimeZone;
-                            tmpOption.value = tmpTimeZone;
-                            if (tmpTimeZone == currentTimeZone) {
-                                tmpOption.selected = true;
-                            }
-                            timeZoneSelection.appendChild(tmpOption);
-                        });
-                    } else {
-                        //adjust selection to match server side setting
-                        for (var i = 0; i < timeZoneSelection.options.length; i++) {
-                            tmpOption = timeZoneSelection.options[i];
-                            if (tmpOption.value == currentTimeZone) {
-                                tmpOption.selected = true;
-                            } else {
-                                tmpOption.selected = false;
-                            }
+            fn.prequest("api/get_timezone", "GET")
+            .then((currentTimeZone) => {
+                var timeZoneSelection = document.getElementById('timezone-selection');
+                if (timeZoneSelection.childElementCount  == 0) {
+                    //initialize select options only if not already done
+                    //TODO: Those timezones should be outsourced to a config file
+                    var allTimezones =['Africa/Abidjan', 'Africa/Accra', 'Africa/Algiers', 'Africa/Bissau', 'Africa/Cairo', 'Africa/Casablanca', 'Africa/Ceuta', 'Africa/El_Aaiun','Africa/Johannesburg',
+                    'Africa/Juba', 'Africa/Khartoum', 'Africa/Lagos', 'Africa/Maputo', 'Africa/Monrovia', 'Africa/Nairobi', 'Africa/Ndjamena', 'Africa/Sao_Tome', 'Africa/Tripoli', 'Africa/Tunis',
+                    'Africa/Windhoek', 'America/Adak', 'America/Anchorage', 'America/Araguaina', 'America/Argentina/Buenos_Aires', 'America/Argentina/Catamarca', 'America/Argentina/Cordoba',
+                    'America/Argentina/Jujuy', 'America/Argentina/La_Rioja', 'America/Argentina/Mendoza', 'America/Argentina/Rio_Gallegos', 'America/Argentina/Salta', 'America/Argentina/San_Juan',
+                    'America/Argentina/San_Luis', 'America/Argentina/Tucuman', 'America/Argentina/Ushuaia', 'America/Asuncion', 'America/Atikokan', 'America/Bahia', 'America/Bahia_Banderas',
+                    'America/Barbados', 'America/Belem', 'America/Belize', 'America/Blanc-Sablon', 'America/Boa_Vista', 'America/Bogota', 'America/Boise', 'America/Cambridge_Bay', 'America/Campo_Grande',
+                    'America/Cancun', 'America/Caracas', 'America/Cayenne', 'America/Chicago', 'America/Chihuahua', 'America/Costa_Rica', 'America/Creston', 'America/Cuiaba', 'America/Curacao',
+                    'America/Danmarkshavn', 'America/Dawson', 'America/Dawson_Creek', 'America/Denver', 'America/Detroit', 'America/Edmonton', 'America/Eirunepe', 'America/El_Salvador', 'America/Fortaleza',
+                    'America/Fort_Nelson', 'America/Glace_Bay', 'America/Godthab', 'America/Goose_Bay', 'America/Grand_Turk', 'America/Guatemala', 'America/Guayaquil', 'America/Guyana', 'America/Halifax',
+                    'America/Havana', 'America/Hermosillo', 'America/Indiana/Indianapolis', 'America/Indiana/Knox', 'America/Indiana/Marengo', 'America/Indiana/Petersburg', 'America/Indiana/Tell_City',
+                    'America/Indiana/Vevay', 'America/Indiana/Vincennes', 'America/Indiana/Winamac', 'America/Inuvik', 'America/Iqaluit', 'America/Jamaica', 'America/Juneau', 'America/Kentucky/Louisville',
+                    'America/Kentucky/Monticello', 'America/La_Paz', 'America/Lima', 'America/Los_Angeles', 'America/Maceio', 'America/Managua', 'America/Manaus', 'America/Martinique', 'America/Matamoros',
+                    'America/Mazatlan', 'America/Menominee', 'America/Merida', 'America/Metlakatla', 'America/Mexico_City', 'America/Miquelon', 'America/Moncton', 'America/Monterrey', 'America/Montevideo',
+                    'America/Nassau', 'America/New_York', 'America/Nipigon', 'America/Nome', 'America/Noronha', 'America/North_Dakota/Beulah', 'America/North_Dakota/Center', 'America/North_Dakota/New_Salem',
+                    'America/Ojinaga', 'America/Panama', 'America/Pangnirtung', 'America/Paramaribo', 'America/Phoenix', 'America/Port-au-Prince', 'America/Porto_Velho', 'America/Port_of_Spain',
+                    'America/Puerto_Rico', 'America/Punta_Arenas', 'America/Rainy_River', 'America/Rankin_Inlet', 'America/Recife', 'America/Regina', 'America/Resolute', 'America/Rio_Branco',
+                    'America/Santarem', 'America/Santiago', 'America/Santo_Domingo', 'America/Sao_Paulo', 'America/Scoresbysund', 'America/Sitka', 'America/St_Johns', 'America/Swift_Current',
+                    'America/Tegucigalpa', 'America/Thule', 'America/Thunder_Bay', 'America/Tijuana', 'America/Toronto', 'America/Vancouver', 'America/Whitehorse', 'America/Winnipeg', 'America/Yakutat',
+                    'America/Yellowknife', 'Antarctica/Casey', 'Antarctica/Davis', 'Antarctica/DumontDUrville', 'Antarctica/Macquarie', 'Antarctica/Mawson', 'Antarctica/Palmer', 'Antarctica/Rothera',
+                    'Antarctica/Syowa', 'Antarctica/Troll', 'Antarctica/Vostok', 'Asia/Almaty', 'Asia/Amman', 'Asia/Anadyr', 'Asia/Aqtau', 'Asia/Aqtobe', 'Asia/Ashgabat', 'Asia/Atyrau', 'Asia/Baghdad',
+                    'Asia/Baku', 'Asia/Bangkok', 'Asia/Barnaul', 'Asia/Beirut', 'Asia/Bishkek', 'Asia/Brunei', 'Asia/Chita', 'Asia/Choibalsan', 'Asia/Colombo', 'Asia/Damascus', 'Asia/Dhaka', 'Asia/Dili',
+                    'Asia/Dubai', 'Asia/Dushanbe', 'Asia/Famagusta', 'Asia/Gaza', 'Asia/Hebron', 'Asia/Hong_Kong', 'Asia/Hovd', 'Asia/Ho_Chi_Minh', 'Asia/Irkutsk', 'Asia/Jakarta', 'Asia/Jayapura',
+                    'Asia/Jerusalem', 'Asia/Kabul', 'Asia/Kamchatka', 'Asia/Karachi', 'Asia/Kathmandu', 'Asia/Khandyga', 'Asia/Kolkata', 'Asia/Krasnoyarsk', 'Asia/Kuala_Lumpur', 'Asia/Kuching', 'Asia/Macau',
+                    'Asia/Magadan', 'Asia/Makassar', 'Asia/Manila', 'Asia/Nicosia', 'Asia/Novokuznetsk', 'Asia/Novosibirsk', 'Asia/Omsk', 'Asia/Oral', 'Asia/Pontianak', 'Asia/Pyongyang', 'Asia/Qatar',
+                    'Asia/Qostanay', 'Asia/Qyzylorda', 'Asia/Riyadh', 'Asia/Sakhalin', 'Asia/Samarkand', 'Asia/Seoul', 'Asia/Shanghai', 'Asia/Singapore', 'Asia/Srednekolymsk', 'Asia/Taipei', 'Asia/Tashkent',
+                    'Asia/Tbilisi', 'Asia/Tehran', 'Asia/Thimphu', 'Asia/Tokyo', 'Asia/Tomsk', 'Asia/Ulaanbaatar', 'Asia/Urumqi', 'Asia/Ust-Nera', 'Asia/Vladivostok', 'Asia/Yakutsk', 'Asia/Yangon',
+                    'Asia/Yekaterinburg', 'Asia/Yerevan', 'Atlantic/Azores', 'Atlantic/Bermuda', 'Atlantic/Canary', 'Atlantic/Cape_Verde', 'Atlantic/Faroe', 'Atlantic/Madeira', 'Atlantic/Reykjavik',
+                    'Atlantic/South_Georgia', 'Atlantic/Stanley', 'Australia/Adelaide', 'Australia/Brisbane', 'Australia/Broken_Hill', 'Australia/Currie', 'Australia/Darwin', 'Australia/Eucla',
+                    'Australia/Hobart', 'Australia/Lindeman', 'Australia/Lord_Howe', 'Australia/Melbourne', 'Australia/Perth', 'Australia/Sydney', 'Europe/Amsterdam','Europe/Andorra', 'Europe/Astrakhan',
+                    'Europe/Athens', 'Europe/Belgrade', 'Europe/Berlin', 'Europe/Brussels', 'Europe/Bucharest', 'Europe/Budapest', 'Europe/Chisinau', 'Europe/Copenhagen', 'Europe/Dublin', 'Europe/Gibraltar',
+                    'Europe/Helsinki', 'Europe/Istanbul', 'Europe/Kaliningrad', 'Europe/Kiev', 'Europe/Kirov', 'Europe/Lisbon', 'Europe/London', 'Europe/Luxembourg', 'Europe/Madrid', 'Europe/Malta',
+                    'Europe/Minsk', 'Europe/Monaco', 'Europe/Moscow', 'Europe/Oslo', 'Europe/Paris', 'Europe/Prague', 'Europe/Riga', 'Europe/Rome', 'Europe/Samara', 'Europe/Saratov', 'Europe/Simferopol',
+                    'Europe/Sofia', 'Europe/Stockholm', 'Europe/Tallinn', 'Europe/Tirane', 'Europe/Ulyanovsk', 'Europe/Uzhgorod', 'Europe/Vienna', 'Europe/Vilnius', 'Europe/Volgograd', 'Europe/Warsaw',
+                    'Europe/Zaporozhye', 'Europe/Zurich', 'Indian/Chagos', 'Indian/Christmas', 'Indian/Cocos', 'Indian/Kerguelen', 'Indian/Mahe', 'Indian/Maldives', 'Indian/Mauritius', 'Indian/Reunion',
+                    'Pacific/Apia', 'Pacific/Auckland', 'Pacific/Bougainville', 'Pacific/Chatham', 'Pacific/Chuuk', 'Pacific/Easter', 'Pacific/Efate', 'Pacific/Enderbury', 'Pacific/Fakaofo', 'Pacific/Fiji',
+                    'Pacific/Funafuti', 'Pacific/Galapagos', 'Pacific/Gambier', 'Pacific/Guadalcanal', 'Pacific/Guam', 'Pacific/Honolulu', 'Pacific/Kiritimati', 'Pacific/Kosrae', 'Pacific/Kwajalein',
+                    'Pacific/Majuro', 'Pacific/Marquesas', 'Pacific/Nauru', 'Pacific/Niue', 'Pacific/Norfolk', 'Pacific/Noumea', 'Pacific/Pago_Pago', 'Pacific/Palau', 'Pacific/Pitcairn', 'Pacific/Pohnpei',
+                    'Pacific/Port_Moresby', 'Pacific/Rarotonga', 'Pacific/Tahiti', 'Pacific/Tarawa', 'Pacific/Tongatapu', 'Pacific/Wake', 'Pacific/Wallis'];
+                    allTimezones.forEach(function (tmpTimeZone) {
+                        var tmpOption = document.createElement("option");
+                        tmpOption.innerText = tmpTimeZone;
+                        tmpOption.value = tmpTimeZone;
+                        if (tmpTimeZone == currentTimeZone) {
+                            tmpOption.selected = true;
                         }
-                    }
-                    document.getElementById('edit-timezone-dialog').show();
+                        timeZoneSelection.appendChild(tmpOption);
+                    });
                 } else {
-                    ons.notification.toast(err, { buttonLabel: 'Dismiss', timeout: window.fn.toastErrorTimeout });
+                    //adjust selection to match server side setting
+                    for (var i = 0; i < timeZoneSelection.options.length; i++) {
+                        tmpOption = timeZoneSelection.options[i];
+                        if (tmpOption.value == currentTimeZone) {
+                            tmpOption.selected = true;
+                        } else {
+                            tmpOption.selected = false;
+                        }
+                    }
                 }
-            });
-        }
+                document.getElementById('edit-timezone-dialog').show();
+            },(err) => ons.notification.toast(err, { buttonLabel: 'Dismiss', timeout: window.fn.toastErrorTimeout }))
+            .finally(() => loadingBarSettingsTimers.removeAttribute("indeterminate"));
+        };
 
         function hideTimeZoneDialog() {
             document.getElementById('edit-timezone-dialog').hide();
-        }
+        };
 
         function saveTimeZone() {
             var timeZoneSelection = document.getElementById('timezone-selection');
@@ -358,17 +350,15 @@
             ons.notification.confirm('Do you really want to set your timezone to "' + newTimezone + '"?').then(function (answer) {
                 if (answer === 1) {
                     loadingBarSettingsTimers.setAttribute("indeterminate", "indeterminate");
-                    fn.requestWithPayload("/api/set_timezone", JSON.stringify({ new_zone : newTimezone }), "POST", function (err, res) {
-                        loadingBarSettingsTimers.removeAttribute("indeterminate");
-                        if (err) {
-                            ons.notification.toast(err, { buttonLabel: 'Dismiss', timeout: window.fn.toastErrorTimeout });
-                        } else {
-                            hideTimeZoneDialog();
-                        }
-                    });
+                    fn.prequestWithPayload("/api/set_timezone", JSON.stringify({ new_zone : newTimezone }), "POST")
+                    .then(
+                        (res) => hideTimeZoneDialog(),
+                        (err) => ons.notification.toast(err, { buttonLabel: 'Dismiss', timeout: window.fn.toastErrorTimeout })
+                    )
+                    .finally(() => loadingBarSettingsTimers.removeAttribute("indeterminate"));
                 }
             });
-        }
+        };
 
         var showDndTimerDialog = function(startHour, startMinute, endHour, endMinute) {
             document.getElementById('edit-dnd-form').start_hour.value = (startHour>=0?startHour:"");
@@ -393,12 +383,9 @@
             while (dndTimerList.lastElementChild !== dndTimerList.firstElementChild) {
                 dndTimerList.removeChild(dndTimerList.lastElementChild);
             }
-            fn.request("api/get_dnd", "GET", function (err, res) {
-                loadingBarSettingsTimers.removeAttribute("indeterminate");
-           
-                if (err) ons.notification.toast(err, { buttonLabel: 'Dismiss', timeout: window.fn.toastErrorTimeout });
-                if (err || res.length == 0 || res[0].enabled == 0) {
-                    //no timer is enabled yet, show possibility to add dnd timer
+            fn.prequest("api/get_dnd", "GET")
+            .then((res) => {
+                if (res && (res.length == 0 || res[0].enabled == 0)) {
                     dndTimerList.appendChild(ons.createElement(
                         "<ons-list-item>\n" +
                         "    <div class='left'>There is no DND timer enabled yet.</div>" +
@@ -429,24 +416,23 @@
                     });
                     dndTimerList.firstElementChild.style.display = "none";
                 }
-            });
-        }
+            },(err) => ons.notification.toast(err, { buttonLabel: 'Dismiss', timeout: window.fn.toastErrorTimeout }))
+            .finally(() => loadingBarSettingsTimers.removeAttribute("indeterminate"));
+        };
 
         function deleteDndTimer() {
             ons.notification.confirm('Do you really want to disable DND?').then(function (answer) {
                 if (answer === 1) {
                     loadingBarSettingsTimers.setAttribute("indeterminate", "indeterminate");
-                    fn.request("api/delete_dnd", "PUT", function (err) {
-                        loadingBarSettingsTimers.removeAttribute("indeterminate");
-                        if (err) {
-                            ons.notification.toast(err, { buttonLabel: 'Dismiss', timeout: window.fn.toastErrorTimeout });
-                        } else {
-                            updateDndTimerPage();
-                        }
-                    });
+                    fn.prequest("api/delete_dnd", "PUT")
+                    .then(
+                        (res) => updateDndTimerPage(),
+                        (err) => ons.notification.toast(err, { buttonLabel: 'Dismiss', timeout: window.fn.toastErrorTimeout })
+                    )
+                    .finally(() => loadingBarSettingsTimers.removeAttribute("indeterminate"));
                 }
             });
-        }
+        };
 
         function saveDndTimer() {
             var start_hour = document.getElementById('edit-dnd-form').start_hour.value;
@@ -454,80 +440,34 @@
             var end_hour = document.getElementById('edit-dnd-form').end_hour.value;
             var end_minute = document.getElementById('edit-dnd-form').end_minute.value;
             if (start_hour && start_minute && end_hour && end_minute) {
-                fn.requestWithPayload("/api/set_dnd", JSON.stringify({ start_hour, start_minute, end_hour, end_minute}), "POST", function (err, res) {
-                if (err) {
-                    ons.notification.toast(err, { buttonLabel: 'Dismiss', timeout: window.fn.toastErrorTimeout });
-                }
-                hideDndTimerDialog();
-                updateDndTimerPage();
-            });
+                fn.prequestWithPayload("/api/set_dnd", JSON.stringify({ start_hour, start_minute, end_hour, end_minute}), "POST")
+                .then((res) => {
+                    hideDndTimerDialog();
+                    updateDndTimerPage();
+                },(err) => ons.notification.toast(err, { buttonLabel: 'Dismiss', timeout: window.fn.toastErrorTimeout }));
             } else {
                 ons.notification.toast("Could not save DND Timer since not all required attributes are provided!", { buttonLabel: 'Dismiss', timeout: window.fn.toastErrorTimeout });
             }
-        }
-
-        function updateSettingsZonedTimersPage() {
-            loadingBarSettingsTimers.setAttribute("indeterminate", "indeterminate");
-            while (timersSettingsZonedTimersList.lastElementChild !== timersSettingsZonedTimersList.firstElementChild) {
-                timersSettingsZonedTimersList.removeChild(timersSettingsZonedTimersList.lastElementChild);
-            }
-
-            fn.request("api/ztimers", "GET", function (err, res) {
-                loadingBarSettingsTimers.removeAttribute("indeterminate");
-
-                if (err) ons.notification.toast(err, { buttonLabel: 'Dismiss', timeout: window.fn.toastErrorTimeout });
-                if (err || res == null || res.length == 0) {
-                    timersSettingsZonedTimersList.firstElementChild.style.display = "";
-                } else {
-                    let index = 0;
-                    res.forEach(function (timer) {
-                        timer.id = index++;
-                        //ADD EDIT (equals create new + delete!)
-                        var elem = ons.createElement(
-                            "<ons-list-item data-id='" + timer.id + "'>\n" +
-                            "    <div class='left'>" + timer.name + ' - ' + timer.human_desc + " (" + timer.cron + ")</div>" +
-                            "    <div class='right'>" +
-                            "        <ons-switch class='timer-active-switch'" + (timer.enabled ? " checked='checked' " : "") + "></ons-switch> " +
-                            "        <ons-button modifier='quiet' class='button-margin timer-delete'>" +
-                            "            <ons-icon icon='fa-trash'></ons-icon>" +
-                            "        </ons-button>" +
-                            "    </div>" +
-                            "</ons-list-item>"
-                        );
-
-                        elem.querySelector('.timer-active-switch').addEventListener('change', function (event) {
-                            toggleTimer(timer.id, event.value, true);
-                        });
-
-                        elem.querySelector('.timer-delete').addEventListener('click', function (event) {
-                            deleteTimer(timer.id, true);
-                        });
-
-                        timersSettingsZonedTimersList.appendChild(elem);
-                    });
-                    timersSettingsZonedTimersList.firstElementChild.style.display = "none";
-                }
-            });
-        }
+        };
 
-        function updateSettingsTimersPage() {
+        function updateSettingsTimersPage(zoned) {
+            zoned = zoned || false;
+            let timersList = zoned ? timersSettingsZonedTimersList : timersSettingsTimersList;
             loadingBarSettingsTimers.setAttribute("indeterminate", "indeterminate");
-            while (timersSettingsTimersList.lastElementChild !== timersSettingsTimersList.firstElementChild) {
-                timersSettingsTimersList.removeChild(timersSettingsTimersList.lastElementChild);
+            while (timersList.lastElementChild !== timersList.firstElementChild) {
+                timersList.removeChild(timersList.lastElementChild);
             }
 
-            fn.request("api/timers", "GET", function (err, res) {
-                loadingBarSettingsTimers.removeAttribute("indeterminate");
-
-                if (err) ons.notification.toast(err, { buttonLabel: 'Dismiss', timeout: window.fn.toastErrorTimeout });
-                if (err || res == null || res.length == 0) {
-                    timersSettingsTimersList.firstElementChild.style.display = "";
+            fn.prequest(zoned ? "api/ztimers" : "api/timers", "GET")
+            .then((res) => {
+                if (res == null || res.length == 0) {
+                    timersList.firstElementChild.style.display = "";
                 } else {
                     res.forEach(function (timer) {
                         //ADD EDIT (equals create new + delete!)
                         var elem = ons.createElement(
                             "<ons-list-item data-id='" + timer.id + "'>\n" +
-                            "    <div class='left'>" + timer.human_desc + " (" + timer.cron + ")</div>" +
+                            "    <div class='left'>" + (zoned ? timer.name + ' - ' : '') + timer.human_desc + " (" + timer.cron + ")</div>" +
                             "    <div class='right'>" +
                             "        <ons-switch class='timer-active-switch'" + (timer.enabled ? " checked='checked' " : "") + "></ons-switch> " +
                             "        <ons-button modifier='quiet' class='button-margin timer-delete'>" +
@@ -545,39 +485,28 @@
                             deleteTimer(timer.id);
                         });
 
-                        timersSettingsTimersList.appendChild(elem);
+                        timersList.appendChild(elem);
                     });
-                    timersSettingsTimersList.firstElementChild.style.display = "none";
+                    timersList.firstElementChild.style.display = "none";
                 }
-            });
-        }
+            },(err) => {
+                timersList.firstElementChild.style.display = "";
+                ons.notification.toast(err, { buttonLabel: 'Dismiss', timeout: window.fn.toastErrorTimeout });
+            })
+            .finally(() => loadingBarSettingsTimers.removeAttribute("indeterminate"));
+        };
 
         function toggleTimer(id, enabled, zoned) {
+            zoned = zoned || false;
             disableTimerInputElements(zoned);
             loadingBarSettingsTimers.setAttribute("indeterminate", "indeterminate");
-
-            if (zoned) {
-                fn.requestWithPayload("api/ztimers/" + id, JSON.stringify({ enabled: enabled }), "PUT", function (err, res) {
-                    if (err) {
-                        ons.notification.toast(err, { buttonLabel: 'Dismiss', timeout: window.fn.toastErrorTimeout });
-                    }
-                    window.setTimeout(function () {
-                        updateSettingsZonedTimersPage();
-                    }, 350);
-                });
-            } else {
-                fn.requestWithPayload("api/timers/" + id, JSON.stringify({ enabled: enabled }), "PUT", function (err, res) {
-                    if (err) {
-                        ons.notification.toast(err, { buttonLabel: 'Dismiss', timeout: window.fn.toastErrorTimeout });
-                    }
-                    window.setTimeout(function () {
-                        updateSettingsTimersPage();
-                    }, 350);
-                });
-            }
+            fn.prequestWithPayload((zoned ? "api/ztimers/" : "api/timers/") + id, JSON.stringify({ enabled: enabled }), "PUT")
+            .then(null,(err) => ons.notification.toast(err, { buttonLabel: 'Dismiss', timeout: window.fn.toastErrorTimeout }))
+            .finally(() => setTimeout(() => updateSettingsTimersPage(zoned),350));
         }
 
         function disableTimerInputElements(zoned) {
+            zoned = zoned || false;
             let list = zoned ? timersSettingsZonedTimersList : timersSettingsTimersList;
             list.querySelectorAll('.timer-active-switch').forEach(function (elem) {
                 elem.setAttribute("disabled", "disabled");
@@ -588,6 +517,7 @@
         }
 
         function enableTimerInputElements(zoned) {
+            zoned = zoned || false;
             let list = zoned ? timersSettingsZonedTimersList : timersSettingsTimersList;
             list.querySelectorAll('.timer-active-switch').forEach(function (elem) {
                 elem.removeAttribute("disabled");
@@ -598,25 +528,14 @@
         }
 
         function deleteTimer(id,zoned) {
+            zoned = zoned || false;
             disableTimerInputElements(zoned);
             ons.notification.confirm('Do you really want to delete this timer?').then(function (answer) {
                 if (answer === 1) {
                     loadingBarSettingsTimers.setAttribute("indeterminate", "indeterminate");
-                    if (zoned) {
-                        fn.request("api/ztimers/" + id, "DELETE", function (err, res) {
-                            if (err) {
-                                ons.notification.toast(err, { buttonLabel: 'Dismiss', timeout: window.fn.toastErrorTimeout });
-                            }
-                            updateSettingsZonedTimersPage();
-                        });
-                    } else {
-                        fn.request("api/timers/" + id, "DELETE", function (err, res) {
-                            if (err) {
-                                ons.notification.toast(err, { buttonLabel: 'Dismiss', timeout: window.fn.toastErrorTimeout });
-                            }
-                            updateSettingsTimersPage();
-                        });
-                    }
+                    fn.prequest((zoned ? "api/ztimers/" : "api/timers/") + id, "DELETE")
+                    .then(null,(err) => ons.notification.toast(err, { buttonLabel: 'Dismiss', timeout: window.fn.toastErrorTimeout }))
+                    .finally(() => updateSettingsTimersPage(zoned));
                 } else {
                     enableTimerInputElements(zoned);
                 }
@@ -743,22 +662,13 @@
                 }
                 let newTimer = { enabled: false, name: timerName, cron: cronTimer, coordinates: coords };
                 zTimers.push(newTimer);
-                fn.requestWithPayload("api/ztimers", JSON.stringify(zTimers), "PUT", function (err, res) {
-                    if (err) {
-                       ons.notification.toast(err, { buttonLabel: 'Dismiss', timeout: window.fn.toastErrorTimeout });
-                    }
-                    updateSettingsZonedTimersPage();
-                    hideNewTimerDialog(zoned);
-                });
-            } else {
-                fn.requestWithPayload("api/timers", JSON.stringify({ cron: cronTimer }), "POST", function (err, res) {
-                    if (err) {
-                        ons.notification.toast(err, { buttonLabel: 'Dismiss', timeout: window.fn.toastErrorTimeout });
-                    }
-                    updateSettingsTimersPage();
-                    hideNewTimerDialog(zoned);
-                });
             }
+            fn.prequestWithPayload(zoned ? "api/ztimers" : "api/timers", JSON.stringify(zoned ? zTimers : { cron: cronTimer }), zoned ? "PUT" : "POST")
+            .then(null,(err) => ons.notification.toast(err, { buttonLabel: 'Dismiss', timeout: window.fn.toastErrorTimeout }))
+            .finally(() => {
+                updateSettingsTimersPage(zoned);
+                hideNewTimerDialog(zoned);
+            });
         }
 
         //if timerId is set to -1, the timer is deleted
@@ -771,14 +681,12 @@
             if (zoned) {
                 // (re-)load current timers list before adding anything
                 loadingBarSettingsTimers.setAttribute("indeterminate", "indeterminate");
-                fn.request("api/ztimers", "GET", function (err, res) {
-                    loadingBarSettingsTimers.removeAttribute("indeterminate");
-                    if (err) ons.notification.toast(err, { buttonLabel: 'Dismiss', timeout: window.fn.toastErrorTimeout });
-                    else {
-                        zTimers = res;
-                        dialog.show();
-                    }
-                });
+                fn.prequest("api/ztimers", "GET")
+                .then((res) => {
+                    zTimers = res;
+                    dialog.show();
+                },(err) => ons.notification.toast(err, { buttonLabel: 'Dismiss', timeout: window.fn.toastErrorTimeout }))
+                .finally(loadingBarSettingsTimers.removeAttribute("indeterminate"));
             } else {
                 dialog.show();
             }
diff --git a/client/settings-token.html b/client/settings-token.html
index 79239e55..2f535158 100644
--- a/client/settings-token.html
+++ b/client/settings-token.html
@@ -34,14 +34,12 @@
 
         function updateSettingsTokenPage() {
             loadingBarSettingsToken.setAttribute("indeterminate", "indeterminate");
-            fn.request("api/token", "GET", function (err, res) {
-                loadingBarSettingsToken.removeAttribute("indeterminate");
-                if (!err) {
-                    settingsTokenLabel.innerHTML = res.token;
-                } else {
-                    ons.notification.toast(err, { buttonLabel: 'Dismiss', timeout: window.fn.toastErrorTimeout })
-                }
-            });
+            fn.prequest("api/token", "GET")
+            .then(
+                (res) => { settingsTokenLabel.innerHTML = res.token; },
+                (err) => ons.notification.toast(err, { buttonLabel: 'Dismiss', timeout: window.fn.toastErrorTimeout })
+            )
+            .finally(() => loadingBarSettingsToken.removeAttribute("indeterminate"));
         }
     </script>
 </ons-page>
\ No newline at end of file
diff --git a/client/settings-wifi.html b/client/settings-wifi.html
index e5eb49e9..334abbb1 100644
--- a/client/settings-wifi.html
+++ b/client/settings-wifi.html
@@ -91,35 +91,30 @@
             updateSettingsWifiPage();
         };
 
-
         function updateSettingsWifiPage() {
             loadingBarSettingsWifi.setAttribute("indeterminate", "indeterminate");
-            fn.request("api/wifi_status", "GET", function (err, res) {
-                loadingBarSettingsWifi.removeAttribute("indeterminate");
-                if (!err) {
-                    wifiCurrentConnectionStatusConnected.innerHTML = res.connected === true ? "Connected" : "Not connected";
-                    if (res.connected) {
-                        wifiCurrentConnectionStatusSSID.innerHTML = res.connection_info.ssid;
-                        wifiCurrentConnectionStatusSignal.innerHTML = res.connection_info.signal;
-                        wifiCurrentConnectionStatusTXBitrate.innerHTML = res.connection_info.tx_bitrate;
-
-                        wifiInputSSID.value = res.connection_info.ssid;
-                    }
-                } else {
-                    ons.notification.toast(err, { buttonLabel: 'Dismiss', timeout: window.fn.toastErrorTimeout })
+            fn.prequest("api/wifi_status", "GET")
+            .then((res) => {
+                wifiCurrentConnectionStatusConnected.innerHTML = res.connected === true ? "Connected" : "Not connected";
+                if (res.connected) {
+                    wifiCurrentConnectionStatusSSID.innerHTML = res.connection_info.ssid;
+                    wifiCurrentConnectionStatusSignal.innerHTML = res.connection_info.signal;
+                    wifiCurrentConnectionStatusTXBitrate.innerHTML = res.connection_info.tx_bitrate;
+
+                    wifiInputSSID.value = res.connection_info.ssid;
                 }
-            });
-        }
+            },(err) => ons.notification.toast(err, { buttonLabel: 'Dismiss', timeout: window.fn.toastErrorTimeout }))
+            .finally(() => loadingBarSettingsWifi.removeAttribute("indeterminate"));
+        };
 
         function updateWifiCredentialsSaveButton() {
             if (wifiInputSSID.value && wifiInputSSID.value !== "" &&
                 wifiInputPassword.value && wifiInputPassword.value !== "") {
-
                 wifiInputSaveButton.removeAttribute("disabled");
             } else {
                 wifiInputSaveButton.setAttribute("disabled", "disabled");
             }
-        }
+        };
 
         function handleWifiSettingsSaveButton() {
             ons.notification.confirm('Are you sure you want to apply the new wifi settings?<br><br>' +
@@ -128,24 +123,21 @@
             ).then(function (answer) {
                 if (answer === 1) {
                     loadingBarSettingsWifi.setAttribute("indeterminate", "indeterminate");
-
-                    fn.requestWithPayload("api/wifi_configuration", JSON.stringify({
+                    fn.prequestWithPayload("api/wifi_configuration", JSON.stringify({
                         ssid: wifiInputSSID.value,
                         password: wifiInputPassword.value
-                    }), "PUT", function (err) {
-                        if (err) {
-                            loadingBarSettingsWifi.removeAttribute("indeterminate");
-                            ons.notification.toast(err, { buttonLabel: 'Dismiss', timeout: window.fn.toastErrorTimeout })
-                        } else {
-                            ons.notification.alert('Successfully applied new wifi credentials.<br>After pressing OK the page will refresh.<br>' +
+                    }), "PUT")
+                    .then(
+                        (res) => ons.notification.alert('Successfully applied new wifi credentials.<br>After pressing OK the page will refresh.<br>' +
                                 'However, you will most likely need to change the URL since the robot will connect to a new wifi.').then(function () {
                                     location.reload();
-                                })
-                        }
-                    })
+                                }),
+                        (err) => ons.notification.toast(err, { buttonLabel: 'Dismiss', timeout: window.fn.toastErrorTimeout })
+                    )
+                    .finally(() => loadingBarSettingsWifi.removeAttribute("indeterminate"));
                 }
             });
-        }
+        };
     </script>
 
     <style>
diff --git a/client/spot-configuration-map.html b/client/spot-configuration-map.html
index 03c90f34..e6167187 100644
--- a/client/spot-configuration-map.html
+++ b/client/spot-configuration-map.html
@@ -39,17 +39,16 @@
 
             loadingBarSavespot.setAttribute("indeterminate", "indeterminate");
             saveButton.setAttribute("disabled", "disabled");
-            fn.requestWithPayload("api/spots", JSON.stringify(spotConfig), "PUT", function (err) {
+            fn.prequestWithPayload("api/spots", JSON.stringify(spotConfig), "PUT")
+            .then((res) => {
+                ons.notification.toast("Successfully saved spot!", { buttonLabel: 'Dismiss', timeout: window.fn.toastOKTimeout });
+                fn.popPage();
+            }, (err) => ons.notification.toast(err, { buttonLabel: 'Dismiss', timeout: window.fn.toastErrorTimeout }))
+            .finally(() => {
                 loadingBarSavespot.removeAttribute("indeterminate");
                 saveButton.removeAttribute("disabled");
-                if (err) {
-                    ons.notification.toast(err, { buttonLabel: 'Dismiss', timeout: window.fn.toastErrorTimeout })
-                } else {
-                    ons.notification.toast("Successfully saved spot!", { buttonLabel: 'Dismiss', timeout: window.fn.toastOKTimeout });
-                    fn.popPage();
-                }
             });
-        }
+        };
     </script>
     <style>
         #spot-configuration-container {
diff --git a/client/zones-configuration-map.html b/client/zones-configuration-map.html
index 59c8b944..a07fcae2 100644
--- a/client/zones-configuration-map.html
+++ b/client/zones-configuration-map.html
@@ -63,15 +63,14 @@
 
             loadingBarSaveZones.setAttribute("indeterminate", "indeterminate");
             saveButton.setAttribute("disabled", "disabled");
-            fn.requestWithPayload("api/zones", JSON.stringify(zonesConfig), "PUT", function (err) {
+            fn.prequestWithPayload("api/zones", JSON.stringify(zonesConfig), "PUT")
+            .then(() => {
+                ons.notification.toast("Successfully saved zones!", { buttonLabel: 'Dismiss', timeout: window.fn.toastOKTimeout });
+                fn.popPage();
+            }, (err) => ons.notification.toast(err, { buttonLabel: 'Dismiss', timeout: window.fn.toastErrorTimeout }))
+            .finally(() => {
                 loadingBarSaveZones.removeAttribute("indeterminate");
                 saveButton.removeAttribute("disabled");
-                if (err) {
-                    ons.notification.toast(err, { buttonLabel: 'Dismiss', timeout: window.fn.toastErrorTimeout })
-                } else {
-                    ons.notification.toast("Successfully saved zones!", { buttonLabel: 'Dismiss', timeout: window.fn.toastOKTimeout });
-                    fn.popPage();
-                }
             });
         }
     </script>
diff --git a/client/zones.html b/client/zones.html
index 571dac52..b9a915fa 100644
--- a/client/zones.html
+++ b/client/zones.html
@@ -28,12 +28,8 @@
 
         function switchToMapZoneEdit(index) {
             loadingBarZones.setAttribute("indeterminate", "indeterminate");
-            fn.request("api/map/latest", "GET", function (err, mapData) {
-                if (err) {
-                    ons.notification.toast(err, { buttonLabel: 'Dismiss', timeout: window.fn.toastErrorTimeout })
-                }
-                loadingBarZones.removeAttribute("indeterminate");
-
+            fn.prequest("api/map/latest", "GET")
+            .then(mapData => {
                 fn.pushPage({
                     'id': 'zones-configuration-map.html',
                     'title': 'Zone configuration map',
@@ -43,17 +39,14 @@
                         'zoneToModify': index
                     }
                 });
-            });
-        }
+            }, err => ons.notification.toast(err, { buttonLabel: 'Dismiss', timeout: window.fn.toastErrorTimeout }))
+            .finally(() => loadingBarZones.removeAttribute("indeterminate"));
+        };
 
         function switchToMapSpotEdit(index) {
             loadingBarZones.setAttribute("indeterminate", "indeterminate");
-            fn.request("api/map/latest", "GET", function (err, mapData) {
-                if (err) {
-                    ons.notification.toast(err, { buttonLabel: 'Dismiss', timeout: window.fn.toastErrorTimeout })
-                }
-                loadingBarZones.removeAttribute("indeterminate");
-
+            fn.prequest("api/map/latest", "GET")
+            .then(mapData => {
                 fn.pushPage({
                     'id': 'spot-configuration-map.html',
                     'title': 'Spot configuration map',
@@ -63,17 +56,14 @@
                         'spotToModify': index
                     }
                 });
-            });
-        }
+            }, err => ons.notification.toast(err, { buttonLabel: 'Dismiss', timeout: window.fn.toastErrorTimeout }))
+            .finally(() => loadingBarZones.removeAttribute("indeterminate"));
+        };
 
         function switchToForbiddenMarkersEdit(index) { // todo: check that all zones are loaded before editing anything
             loadingBarZones.setAttribute("indeterminate", "indeterminate");
-            fn.request("api/map/latest", "GET", function (err, mapData) {
-                if (err) {
-                    ons.notification.toast(err, { buttonLabel: 'Dismiss', timeout: window.fn.toastErrorTimeout })
-                }
-                loadingBarZones.removeAttribute("indeterminate");
-
+            fn.prequest("api/map/latest", "GET")
+            .then(mapData => {
                 fn.pushPage({
                     'id': 'forbidden-markers-configuration-map.html',
                     'title': 'Forbidden markers configuration map',
@@ -81,70 +71,64 @@
                         'map': mapData
                     }
                 });
-            });
-        }
+            }, err => ons.notification.toast(err, { buttonLabel: 'Dismiss', timeout: window.fn.toastErrorTimeout }))
+            .finally(() => loadingBarZones.removeAttribute("indeterminate"));
+        };
 
         function deleteZone(index) {
             zonesConfig.splice(index, 1);
-
             saveZones();
-        }
+        };
 
         function renameZone(index) {
-            ons.notification.prompt({message: 'Enter new name for zone \''+ zonesConfig[index].name + '\'?', defaultValue: zonesConfig[index].name, cancelable: true }).then(function(name) {
+            ons.notification.prompt({message: 'Enter new name for zone \''+ zonesConfig[index].name + '\'?', defaultValue: zonesConfig[index].name, cancelable: true })
+            .then(name => {
                 if (name && name.length && zonesConfig[index].name !== name) {
                     zonesConfig[index].name = name;
                     saveZones();
                 }
             });
-        }
+        };
 
         function deleteSpot(index) {
             spotConfig.splice(index, 1);
-
             saveSpots();
-        }
+        };
 
         function renameSpot(index) {
-            ons.notification.prompt({message: 'Enter new name for spot \''+ spotConfig[index].name + '\'?', defaultValue: spotConfig[index].name, cancelable: true }).then(function(name) {
+            ons.notification.prompt({message: 'Enter new name for spot \''+ spotConfig[index].name + '\'?', defaultValue: spotConfig[index].name, cancelable: true })
+            .then(name => {
                 if (name && name.length && spotConfig[index].name !== name) {
                     spotConfig[index].name = name;
                     saveSpots();
                 }
             });
-        }
+        };
 
         function saveZones() {
             loadingBarZones.setAttribute("indeterminate", "indeterminate");
-
             zonesConfig.sort((a, b) => a.name.localeCompare(b.name));
-            fn.requestWithPayload("api/zones", JSON.stringify(zonesConfig), "PUT", function (err) {
-                loadingBarZones.removeAttribute("indeterminate");
-                if (err) {
-                    ons.notification.toast(err, { buttonLabel: 'Dismiss', timeout: window.fn.toastErrorTimeout })
-                } else {
-                    generateZonesList();
-                }
-            });
-        }
+            fn.prequestWithPayload("api/zones", JSON.stringify(zonesConfig), "PUT")
+            .then(
+                (res) => generateZonesList(),
+                (err) => ons.notification.toast(err, { buttonLabel: 'Dismiss', timeout: window.fn.toastErrorTimeout })
+            )
+            .finally(() => loadingBarZones.removeAttribute("indeterminate"));
+        };
 
         function saveSpots() {
             loadingBarZones.setAttribute("indeterminate", "indeterminate");
-
             spotConfig.sort((a, b) => a.name.localeCompare(b.name));
-            fn.requestWithPayload("api/spots", JSON.stringify(spotConfig), "PUT", function (err) {
-                loadingBarZones.removeAttribute("indeterminate");
-                if (err) {
-                    ons.notification.toast(err, { buttonLabel: 'Dismiss', timeout: window.fn.toastErrorTimeout })
-                } else {
-                    generateSpotList();
-                }
-            });
-        }
+            fn.prequestWithPayload("api/spots", JSON.stringify(spotConfig), "PUT")
+            .then(
+                (res) => generateSpotList(),
+                (err) => ons.notification.toast(err, { buttonLabel: 'Dismiss', timeout: window.fn.toastErrorTimeout })
+            )
+            .finally(() => loadingBarZones.removeAttribute("indeterminate"));
+        };
 
         function addNewZone() {
             const newZoneName = document.getElementById("add-zone-name").value;
-
             if(newZoneName.trim() === "") {
                 ons.notification.toast("Please enter a zone name", { buttonLabel: 'Dismiss', timeout: window.fn.toastErrorTimeout })
             } else {
@@ -153,13 +137,11 @@
                     coordinates: []
                 });
             }
-
             saveZones();
-        }
+        };
 
         function addNewSpot() {
             const newSpotName = document.getElementById("add-spot-name").value;
-
             if(newSpotName.trim() === "") {
                 ons.notification.toast("Please enter a spot name", { buttonLabel: 'Dismiss', timeout: window.fn.toastErrorTimeout })
             } else {
@@ -168,9 +150,8 @@
                     coordinates: [25000, 25000]
                 });
             }
-
             saveSpots();
-        }
+        };
 
         function generateZonesList() {
             let out = "";
@@ -237,38 +218,25 @@
         }
 
         ons.getScriptPage().onShow = function () {
-
             loadingBarZones.setAttribute("indeterminate", "indeterminate");
 
             // request map update
             fn.prequest("api/poll_map", "GET").then(null, (err) => ons.notification.toast(err, { buttonLabel: 'Dismiss', timeout: window.fn.toastErrorTimeout }));
 
-            /* check for area and go to configuration */
+            // check for area and go to configuration
+            const getZones = fn.prequest("api/zones", "GET")
+            .then(res => {
+                zonesConfig = res;
+                generateZonesList();
+            }, err => ons.notification.toast(err, { buttonLabel: 'Dismiss', timeout: window.fn.toastErrorTimeout }));
 
-            const getZones = fetch("api/zones")
-                .then(res => res.json())
-                .then(res => {
-                    zonesConfig = res;
-                    generateZonesList();
-                })
-                .catch(err => {
-                    console.error(err);
-                    ons.notification.toast(err, { buttonLabel: 'Dismiss', timeout: window.fn.toastErrorTimeout });
-                });
-            const getSpots = fetch("api/spots")
-                .then(res => res.json())
-                .then(res => {
-                    spotConfig = res;
-                    generateSpotList();
-                })
-                .catch(err => {
-                    console.error(err);
-                    ons.notification.toast(err, { buttonLabel: 'Dismiss', timeout: window.fn.toastErrorTimeout });
-                });
+            const getSpots = fn.prequest("api/spots", "GET")
+            .then(res => {
+                spotConfig = res;
+                generateSpotList();
+            }, err => ons.notification.toast(err, { buttonLabel: 'Dismiss', timeout: window.fn.toastErrorTimeout }));
 
-            Promise.all([getZones, getSpots]).then(_ => {
-                loadingBarZones.removeAttribute("indeterminate");
-            });
+            Promise.all([getZones, getSpots]).finally(() => loadingBarZones.removeAttribute("indeterminate"));
         };
     </script>
     <style>