diff --git a/installer.sh b/installer.sh
index ee4f793..87d18de 100644
--- a/installer.sh
+++ b/installer.sh
@@ -229,16 +229,8 @@ fi
 webserv="${webserv//:}" && webserv="${webserv,,}"
 
 #Setting Menulist to webserver
-if [[ $webserv = "apache" ]]; then
-#Apache Menulist
-CMSL=("${ApacheCMSL[@]}")
-options=("${ApacheOptions[@]}")
-fi
-if [[ $webserv = "nginx" ]]; then
-#nginx Menulist
-CMSL=("${NginxCMSL[@]}")
-options=("${NginxOptions[@]}")
-fi
+declare -n CMSL="$webserv"CMSL
+declare -n options="$webserv"Options
 
 echo "Generating apt list for Generic"
 curl --silent --show-error "$repo"/raw/branch/"$branch"/CoreModules/generic/apt.list >>/tmp/apt.list
@@ -265,7 +257,7 @@ done
 ##----------##
 
 if [ $IMODE = n ]; then
-option=$(whiptail --nocancel --title "Title" --checklist "Features" 11 110 5 "${options[@]}" 3>&1 1>&2 2>&3)
+option=$(whiptail --nocancel --title "Additional modules" --checklist "Features" 11 110 5 "${options[@]}" 3>&1 1>&2 2>&3)
 fi
 if [ $IMODE = l ]; then
 choice () {