diff --git a/statusio-selector.user.js b/statusio-selector.user.js
index 364a91c..0f51a8f 100644
--- a/statusio-selector.user.js
+++ b/statusio-selector.user.js
@@ -912,87 +912,94 @@ if (window.location.href.indexOf("5cf02dde58a00904bda41926") > -1) {
 
     // regional functions
     function cacentral1ButtonClickAction(zEvent) {
-        toggleRegion("ca-central-1");
-        toggleButtonColor("cacentral1Button");
+        var buttonName = "cacentral1Button";
+        var buttonRegions = ["ca-central-1"];
+        toggleRegion(buttonName, buttonRegions);
     };
     function eucentral1ButtonClickAction(zEvent) {
-        toggleRegion("eu-central-1");
-        toggleButtonColor("eucentral1Button");
+        var buttonName = "eucentral1Button";
+        var buttonRegions = ["eu-central-1"];
+        toggleRegion(buttonName, buttonRegions);
     };
     function euwest2ButtonClickAction(zEvent) {
-        toggleRegion("eu-west-2");
-        toggleButtonColor("euwest2Button");
+        var buttonName = "euwest2Button";
+        var buttonRegions = ["eu-west-2"];
+        toggleRegion(buttonName, buttonRegions);
     };
     function uswest1ButtonClickAction(zEvent) {
-        toggleRegion("us-west-1");
-        toggleButtonColor("uswest1Button");
+        var buttonName = "uswest1Button";
+        var buttonRegions = ["us-west-1"];
+        toggleRegion(buttonName, buttonRegions);
     };
     function uswest2ButtonClickAction(zEvent) {
-        toggleRegion("us-west-2");
-        toggleButtonColor("uswest2Button");
+        var buttonName = "uswest2Button";
+        var buttonRegions = ["us-west-2"];
+        toggleRegion(buttonName, buttonRegions);
     };
     function uswest2CPButtonClickAction(zEvent) {
-        toggleRegion("us-west-2");
-        toggleRegion("us-west-1");
-        toggleRegion("us-east-1");
-        toggleButtonColor("uswest2Button");
+        var buttonName = "uswest2Button";
+        var buttonRegions = ["us-west-2", "us-west-1", "us-east-1"];
+        toggleRegion(buttonName, buttonRegions);
     };
     function useast1ButtonClickAction(zEvent) {
-        toggleRegion("us-east-1");
-        toggleButtonColor("useast1Button");
+        var buttonName = "useast1Button";
+        var buttonRegions = ["us-east-1"];
+        toggleRegion(buttonName, buttonRegions);
     };
     function useast2ButtonClickAction(zEvent) {
-        toggleRegion("us-east-2");
-        toggleButtonColor("useast2Button");
+        var buttonName = "useast2Button";
+        var buttonRegions = ["us-east-2"];
+        toggleRegion(buttonName, buttonRegions);
     };
     function apsouth1ButtonClickAction(zEvent) {
-        toggleRegion("ap-south-1");
-        toggleButtonColor("apsouth1Button");
+        var buttonName = "apsouth1Button";
+        var buttonRegions = ["ap-south-1"];
+        toggleRegion(buttonName, buttonRegions);
     };
     function apsoutheast1ButtonClickAction(zEvent) {
-        toggleRegion("ap-southeast-1");
-        toggleButtonColor("apsoutheast1Button");
+        var buttonName = "apsoutheast1Button";
+        var buttonRegions = ["ap-southeast-1"];
+        toggleRegion(buttonName, buttonRegions);
     };
     function apsoutheast2ButtonClickAction(zEvent) {
-        toggleRegion("ap-southeast-2");
-        toggleButtonColor("apsoutheast2Button");
+        var buttonName = "apsoutheast2Button";
+        var buttonRegions = ["ap-southeast-2"];
+        toggleRegion(buttonName, buttonRegions);
     };
     function apnortheast1ButtonClickAction(zEvent) {
-        toggleRegion("ap-northeast-1");
-        toggleButtonColor("apnortheast1Button");
+        var buttonName = "apnortheast1Button";
+        var buttonRegions = ["ap-northeast-1"];
+        toggleRegion(buttonName, buttonRegions);
     };
     function euwest1ButtonClickAction(zEvent) {
-        toggleRegion("eu-west-1");
-        toggleButtonColor("euwest1Button");
+        var buttonName = "euwest1Button";
+        var buttonRegions = ["eu-west-1"];
+        toggleRegion(buttonName, buttonRegions);
     };
     function ceButtonClickAction(zEvent) {
         toggleButtonColor("ceButton");
         toggleCe();
     };
     function stage1ButtonClickAction(zEvent) {
-        toggleRegion("ca-central-1");
-        toggleRegion("eu-central-1");
-        toggleRegion("eu-west-2");
+        var buttonName = "stage1Button";
+        var buttonRegions = ["ca-central-1", "eu-central-1", "eu-west-2"];
+        toggleRegion(buttonName, buttonRegions);
         toggleCe();
-        toggleButtonColor("stage1Button");
     };
     function stage2ButtonClickAction(zEvent) {
-        toggleRegion("us-west-2");
-        toggleRegion("us-west-1");
-        toggleRegion("us-east-1");
-        toggleRegion("us-east-2");
-        toggleRegion("ap-southeast-1");
-        toggleButtonColor("stage2Button");
+        var buttonName = "stage2Button";
+        var buttonRegions = ["us-west-2", "us-west-1", "us-east-1", "us-east-2", "ap-southeast-1"];
+        toggleRegion(buttonName, buttonRegions);
     };
     function stage3amButtonClickAction(zEvent) {
-        toggleRegion("ap-south-1");
-        toggleRegion("ap-southeast-2");
-        toggleRegion("ap-northeast-1");
-        toggleButtonColor("stage3amButton");
+        var buttonName = "stage3amButton";
+        var buttonRegions = ["ap-south-1", "ap-southeast-2", "ap-northeast-1"];
+        toggleRegion(buttonName, buttonRegions);
     };
     function stage3pmButtonClickAction(zEvent) {
-        toggleRegion("eu-west-1");
-        toggleButtonColor("stage3pmButton");
+        var buttonName = "stage3pmButton";
+        var buttonRegions = ["eu-west-1"];
+        toggleRegion(buttonName, buttonRegions);
     };
 
     // component functions