diff --git a/AvocadoEdition_Light/classes/menucategory/menucategory.class.php b/AvocadoEdition_Light/classes/menucategory/menucategory.class.php
index b1295e5..8d2d794 100644
--- a/AvocadoEdition_Light/classes/menucategory/menucategory.class.php
+++ b/AvocadoEdition_Light/classes/menucategory/menucategory.class.php
@@ -49,48 +49,46 @@ class MenuCategory extends Menu
   }
   public function buildHtml()
   {
-    global $g5, $is_admin, $auth, $menu, $auth_menu;
-    $sub_menu = preg_replace('/^.*\/([^\/]+\.php)$/', '/$1', str_replace([G5_ADMIN_URL, "/adm"], ["", ""], $_SERVER["SCRIPT_NAME"]));
+    global $is_admin;
 
-    $str = "";
-    foreach ($this->childmenu as $key => $menu) {
-      if ($is_admin != 'super')
+    $sub_menu = preg_replace('/^.*\/([^\/]+\.php)$/', '/$1', str_replace([G5_ADMIN_URL, '/adm'], ['', ''], $_SERVER['SCRIPT_NAME']));
+
+    $str = '';
+    $gnb_grp_style = false;
+
+    foreach ($this->childmenu as $menu) {
+      if ($is_admin != 'super' || !$menu->display) {
         continue;
+      }
 
-      if (!$menu->display)
-        continue;
+      $gnb_grp_div = (($menu->gnb_grp_div == 1 && !$gnb_grp_style) || ($menu->gnb_grp_div != 1 && $gnb_grp_style)) ? 'gnb_grp_div' : '';
+      $gnb_grp_style = $menu->gnb_grp_div == 1 ? 'gnb_grp_style' : '';
 
-      if (($menu->gnb_grp_div == 1 && $gnb_grp_style == false) || ($menu->gnb_grp_div != 1 && $gnb_grp_style == true))
-        $gnb_grp_div = 'gnb_grp_div';
-      else
-        $gnb_grp_div = '';
+      $menu_url = preg_replace('/^.*\/([^\/]+\.php)$/', '/$1', str_replace([G5_ADMIN_URL, '/adm'], ['', ''], $menu->url));
+      $check_gnb_grp_style = '';
 
-      if ($menu->gnb_grp_div == 1)
-        $gnb_grp_style = 'gnb_grp_style';
-      else
-        $gnb_grp_style = '';
-
-      $check_gnb_grp_style = "";
-      $menu_url = preg_replace('/^.*\/([^\/]+\.php)$/', '/$1', str_replace([G5_ADMIN_URL, "/adm"], ["", ""], $menu->url));
       if (
         $menu_url == $sub_menu || in_array($sub_menu, array_map(function ($url) {
-          return preg_replace('/^.*\/([^\/]+\.php)$/', '/$1', str_replace([G5_ADMIN_URL, "/adm"], ["", ""], $url));
+          return preg_replace('/^.*\/([^\/]+\.php)$/', '/$1', str_replace([G5_ADMIN_URL, '/adm'], ['', ''], $url));
         }, $menu->suburl))
       ) {
-        $check_gnb_grp_style = "check";
+        $check_gnb_grp_style = 'check';
         $this->selected = true;
       }
 
-      $str .= '<li class="gnb_2dli ' . $check_gnb_grp_style . '"><a href="' . $menu->url . '" class="gnb_2da ' . $gnb_grp_style . ' ' . $gnb_grp_div . '" data-text="' . $menu->name . '" style="--icon:\'' . $menu->icon . '\'">' . $menu->name . '</a></li>';
-    }
-    $str .= "</ul>";
-
-    if ($this->selected) {
-      $str = "<ul class=\"gnb_2dul\" style=\"display: block\">{$str}";
-    } else {
-      $str = "<ul class=\"gnb_2dul\">{$str}";
+      $str .= sprintf(
+        '<li class="gnb_2dli %s"><a href="%s" class="gnb_2da %s %s" data-text="%s" style="--icon:\'%s\'">%s</a></li>',
+        $check_gnb_grp_style,
+        $menu->url,
+        $gnb_grp_style,
+        $gnb_grp_div,
+        $menu->name,
+        $menu->icon,
+        $menu->name
+      );
     }
 
-    return $str;
+    $ul_class = $this->selected ? 'gnb_2dul" style="display: block"' : 'gnb_2dul"';
+    return "<ul class=\"{$ul_class}\">{$str}</ul>";
   }
 }
diff --git a/AvocadoEdition_Light/classes/setting/setting.class.php b/AvocadoEdition_Light/classes/setting/setting.class.php
index 8b168ab..3c888e7 100644
--- a/AvocadoEdition_Light/classes/setting/setting.class.php
+++ b/AvocadoEdition_Light/classes/setting/setting.class.php
@@ -49,51 +49,57 @@ class Setting
     $this->html = "";
     $this->extrahtml = "";
     $this->is_value_added = false;
+
     if ($init) {
       $this->init();
     }
 
     if (!empty($data)) {
       foreach ($data as $val) {
-        switch ($val["type"]) {
-          case "desc":
-            $this->addDescription($val["desc"], array_key_exists("default", $val) ? (is_array($val["default"]) ? $val["default"] : []) : []);
-            break;
-          case "text":
-            $this->addTextSetting($val["desc"], array_key_exists("default", $val) ? (is_array($val["default"]) ? $val["default"] : []) : [], array_key_exists("placeholder", $val) ? $val["placeholder"] : "");
-            break;
-          case "textarea":
-            $this->addTextareaSetting($val["desc"], array_key_exists("default", $val) ? (is_array($val["default"]) ? $val["default"] : []) : [], array_key_exists("placeholder", $val) ? $val["placeholder"] : "");
-            break;
-          case "editor":
-            $this->addEditorSetting($val["desc"], array_key_exists("default", $val) ? (is_array($val["default"]) ? $val["default"] : []) : [], array_key_exists("js", $val) ? $val["js"] : true);
-            break;
-          case "image":
-            $this->addImageSetting($val["desc"], array_key_exists("default", $val) ? (is_array($val["default"]) ? $val["default"] : []) : []);
-            break;
-          case "select":
-            $this->addSelectSetting($val["desc"], array_key_exists("default", $val) ? (is_array($val["default"]) ? $val["default"] : []) : [], array_key_exists("values", $val) ? $val["values"] : "");
-            break;
-          case "color":
-            $this->addColorSetting($val["desc"], array_key_exists("default", $val) ? (is_array($val["default"]) ? $val["default"] : []) : []);
-            break;
-          case "color2":
-            $this->addColor2Setting($val["desc"], array_key_exists("default", $val) ? (is_array($val["default"]) ? $val["default"] : []) : []);
-            break;
-          case "border":
-            $this->addBorderSetting($val["desc"], array_key_exists("default", $val) ? (is_array($val["default"]) ? $val["default"] : []) : []);
-            break;
-          case "rect":
-            $this->addRectSetting($val["desc"], array_key_exists("default", $val) ? (is_array($val["default"]) ? $val["default"] : []) : []);
-            break;
-          case "radius":
-            $this->addRadiusSetting($val["desc"], array_key_exists("default", $val) ? (is_array($val["default"]) ? $val["default"] : []) : []);
-            break;
-        }
+        $this->addSetting($val);
       }
     }
   }
 
+  public function addSetting($set)
+  {
+    switch ($set["type"]) {
+      case "desc":
+        $this->addDescription($set["desc"], array_key_exists("default", $set) ? (is_array($set["default"]) ? $set["default"] : []) : []);
+        break;
+      case "text":
+        $this->addTextSetting($set["desc"], array_key_exists("default", $set) ? (is_array($set["default"]) ? $set["default"] : []) : [], array_key_exists("placeholder", $set) ? $set["placeholder"] : "");
+        break;
+      case "textarea":
+        $this->addTextareaSetting($set["desc"], array_key_exists("default", $set) ? (is_array($set["default"]) ? $set["default"] : []) : [], array_key_exists("placeholder", $set) ? $set["placeholder"] : "");
+        break;
+      case "editor":
+        $this->addEditorSetting($set["desc"], array_key_exists("default", $set) ? (is_array($set["default"]) ? $set["default"] : []) : [], array_key_exists("js", $set) ? $set["js"] : true);
+        break;
+      case "image":
+        $this->addImageSetting($set["desc"], array_key_exists("default", $set) ? (is_array($set["default"]) ? $set["default"] : []) : []);
+        break;
+      case "select":
+        $this->addSelectSetting($set["desc"], array_key_exists("default", $set) ? (is_array($set["default"]) ? $set["default"] : []) : [], array_key_exists("values", $set) ? $set["values"] : "");
+        break;
+      case "color":
+        $this->addColorSetting($set["desc"], array_key_exists("default", $set) ? (is_array($set["default"]) ? $set["default"] : []) : []);
+        break;
+      case "color2":
+        $this->addColor2Setting($set["desc"], array_key_exists("default", $set) ? (is_array($set["default"]) ? $set["default"] : []) : []);
+        break;
+      case "border":
+        $this->addBorderSetting($set["desc"], array_key_exists("default", $set) ? (is_array($set["default"]) ? $set["default"] : []) : []);
+        break;
+      case "rect":
+        $this->addRectSetting($set["desc"], array_key_exists("default", $set) ? (is_array($set["default"]) ? $set["default"] : []) : []);
+        break;
+      case "radius":
+        $this->addRadiusSetting($set["desc"], array_key_exists("default", $set) ? (is_array($set["default"]) ? $set["default"] : []) : []);
+        break;
+    }
+  }
+
   public static function getSettingList()
   {
     global $g5;
@@ -420,7 +426,7 @@ class Setting
   public function getSettingHtml()
   {
     $html = "";
-    foreach ($this->settings as $idx => $val) {
+    foreach ($this->settings as $val) {
       if ($html == "") {
         $html .= $this->addHeader();
       } else {