diff --git a/inc/sites.inc b/inc/sites.inc
index 97700198..d89e0d11 100755
--- a/inc/sites.inc
+++ b/inc/sites.inc
@@ -45,6 +45,7 @@ DELSITE(){
 		echo -e "${idsCL[LightRed]}-------------------------------------------${idsCL[Default]}"
 		echo
 		echo -en "${idsCL[LightCyan]}Removing NGINX files ... ${idsCL[Default]}"
+		rm -f ${NM_NGINXPATH}/sites-available/${DEL_SITE}* >/dev/null 2>&1
 		rm -f ${NM_NGINXPATH}/sites-enabled/${DEL_SITE}* >/dev/null 2>&1
 		echo -e "${idsCL[Green]}Done${idsCL[Default]}"
 		echo
@@ -128,7 +129,7 @@ NEWSITE(){
 		NGINX_SERVERNAME=${NEW_SITE}
 			
 	fi
-	nginxconfig=${NM_NGINXPATH}/sites-enabled/${MAIN_SITE}.conf
+	nginxconfig=${NM_NGINXPATH}/sites-available/${MAIN_SITE}.conf
 	
 	if [ -f ${nginxconfig} ]; then
 		echo -en "${idsCL[LightRed]}This site already exists, overwrite it? (y/N): ${idsCL[Default]}"
@@ -337,12 +338,12 @@ NEWSITE(){
 				
 			######################################### PROXY
 			else
-				NEWPROXYSITE_CREATE ${MAIN_SITE} ${NGINX_SERVERNAME} ${PROXYHOST} ${PROXYPORT} ${PROXYSCHEME} ${WEBSOCKET} ${HSTS} ${EXPLOITS} ${SECURE} ${CREATE_SSL} ${CERTTEST}
+				NEWPROXYSITE_CREATE ${MAIN_SITE} ${NGINX_SERVERNAME} ${PROXYHOST} ${PROXYPORT} ${PROXYSCHEME} ${WEBSOCKET} ${HSTS} ${EXPLOITS} ${SECURE} ${CREATE_SSL} ${CERTTEST} NEWSITE
 
 			fi
 			
 			# if [ "${CREATE_SSL}" = "yes" ]; then
-			# 	[ -f ${NM_NGINXPATH}/sites-enabled/default* ] && SERVICE_MGMT nginx restart >/dev/null 2>&1
+			# 	[ -f ${NM_NGINXPATH}/sites-available/default* ] && SERVICE_MGMT nginx restart >/dev/null 2>&1
 			# 	NEWCERT ${NEW_SITE} newsite ${CERTTEST}
 			# fi
 			
@@ -352,7 +353,7 @@ NEWSITE(){
 			echo
 			echo -e "${idsCL[LightGreen]}The new site for '${idsCL[LightGreen]}${NEW_SITE}${idsCL[Default]}' has been created.${idsCL[Default]}"
 			echo
-			if [ ! -f ${NM_NGINXPATH}/sites-enabled/default* ]; then
+			if [ ! -f ${NM_NGINXPATH}/sites-available/default* ]; then
 				echo -en "${idsCL[LightCyan]}Restart NGINX on all Nodes (Y/n): ${idsCL[Default]}"
 				read -n 1 NGINXRELOAD
 				if [[ ${NGINXRELOAD} =~ ^[Nn]$ ]]; then
@@ -387,6 +388,7 @@ NEWPROXYSITE_CREATE(){
 	SECURE=${9}
 	SSL=${10}
 	CERTTEST=${11}
+	[ "${12}" == "NEWSITE" ] && NEWSITE=1 || NEWSITE=0
 	
 	[ "${CERTTEST}" == "1" ] && CERTTEST='-test ' || CERTTEST=''
 
@@ -398,12 +400,12 @@ NEWPROXYSITE_CREATE(){
 		MAIN_SITE=${SERVERNAMES}
 		NGINX_SERVERNAME=${SERVERNAMES}
 	fi
-	nginxconfig=${NM_NGINXPATH}/sites-enabled/${SITENAME,,}.conf
+	nginxconfig=${NM_NGINXPATH}/sites-available/${SITENAME,,}.conf
 	if [ "${MAIN_SITE}" != "${SITENAME}" ] && [ -f ${nginxconfig} ]; then
 		echo -e "\n${idsCL[LightRed]}New site name already exists!${idsCL[Default]}\n"
 		exit 1
 	else
-		[ "${MAIN_SITE}" != "${SITENAME}" ] && [ -f ${NM_NGINXPATH}/sites-enabled/${SITENAME}.conf ] && mv ${NM_NGINXPATH}/sites-enabled/${SITENAME}.conf ${nginxconfig}
+		[ "${MAIN_SITE}" != "${SITENAME}" ] && [ -f ${NM_NGINXPATH}/sites-available/${SITENAME}.conf ] && mv ${NM_NGINXPATH}/sites-available/${SITENAME}.conf ${nginxconfig}
 		if [ ! -f ${nginxconfig} ]; then
 			echo -en "${idsCL[LightCyan]}Configuring initial NGINX Site config ... "
 			cp ${NM_FOLDER}/templates/nginx.proxy.site ${nginxconfig}
@@ -518,6 +520,8 @@ NEWPROXYSITE_CREATE(){
 		sed -i "s/##include/#include/g" ${nginxconfig}
 		sed -i "s/##ssl_/#ssl_/g" ${nginxconfig}
 		
+		[ ${NEWSITE} -eq 1 ] && ln -s ${nginxconfig} ${NM_NGINXPATH}/sites-enabled/${SITENAME,,}.conf
+		
 		echo -e "${idsCL[LightGreen]}Site Configuration Complete${idsCL[Default]}"
 		
 	fi
@@ -559,7 +563,7 @@ SITEINFO(){
 	else
 		echo -e "${idsCL[LightGreen]}Local NGINX Sites ${idsCL[Default]}"
 	fi	
-	gosite=${NM_NGINXPATH[${RUN_NODE_TYPE}]}/sites-enabled
+	gosite=${NM_NGINXPATH[${RUN_NODE_TYPE}]}/sites-available
 	declare -A SITELIST
 	if [ "${gosite}" != "" ]; then
 		[ "${SEARCH}" != "0" ] && files=$(shopt -s nullglob dotglob; echo ${gosite}/*${SEARCH,,}*.conf) || files=$(shopt -s nullglob dotglob; echo ${gosite}/*.conf)
@@ -574,9 +578,9 @@ SITEINFO(){
 					[ ${EDIT} -eq 1 ] && msg1='##) Site Hostname' || msg1='Site Hostname'
 					echo -en "${idsCL[Yellow]}"
 					if [ ${EDIT} -eq 1 ]; then
-						printf "%-32s %-8s %-6s %-6s %-6s %-6s %-6s %-8s\n" "${msg1}" "Type" "SSL" "HSTS" "WBSKT" "EXPLT" "LOCK" "Proxy Connection"
+						printf "%-32s %-7s %-8s %-6s %-6s %-6s %-6s %-6s %-8s\n" "${msg1}" "Live" "Type" "SSL" "HSTS" "WBSKT" "EXPLT" "LOCK" "Proxy Connection"
 					else
-						printf "%-28s %-8s %-6s %-6s %-6s %-6s %-6s %-8s\n" "${msg1}" "Type" "SSL" "HSTS" "WBSKT" "EXPLT" "LOCK" "Proxy Connection"
+						printf "%-28s %-7s %-8s %-6s %-6s %-6s %-6s %-6s %-8s\n" "${msg1}" "Live" "Type" "SSL" "HSTS" "WBSKT" "EXPLT" "LOCK" "Proxy Connection"
 					fi
 					echo -en "${idsCL[Default]}"
 					DIVIDER false yellow ${dl}
@@ -624,15 +628,17 @@ SITEINFO(){
 				else
 					SECURE=''
 				fi
+				
+				[ -f ${NM_NGINXPATH[${RUN_NODE_TYPE}]}/sites-enabled/${SITENAME}.conf ] && LIVE='Yes' || LIVE=''
 			
 
 				[ ${i} -lt 10 ] && ii=" ${i}" || ii=${i}
 				[ ${EDIT} -eq 1 ] && msg1="${ii}) ${SITENAME}" || msg1="${SITENAME}"
 				echo -en "${idsCL[White]}"
 				if [ ${EDIT} -eq 1 ]; then
-					printf "%-32s %-8s %-6s %-6s %-6s %-6s %-6s %-14s\n" "${msg1}" "${SITE_TYPE}" "${SSL}" "${HSTS}" "${WEBSOCKET}" "${EXPLOITS}" "${SECURE}" "${PROXYHOST_FULL}"
+					printf "%-32s %-8s %-6s %-6s %-6s %-6s %-6s %-14s\n" "${msg1}" "${LIVE}" "${SITE_TYPE}" "${SSL}" "${HSTS}" "${WEBSOCKET}" "${EXPLOITS}" "${SECURE}" "${PROXYHOST_FULL}"
 				else
-					printf "%-28s %-8s %-6s %-6s %-6s %-6s %-6s %-14s\n" "${msg1}" "${SITE_TYPE}" "${SSL}" "${HSTS}" "${WEBSOCKET}" "${EXPLOITS}" "${SECURE}" "${PROXYHOST_FULL}"
+					printf "%-28s %-8s %-6s %-6s %-6s %-6s %-6s %-14s\n" "${msg1}" "${LIVE}" "${SITE_TYPE}" "${SSL}" "${HSTS}" "${WEBSOCKET}" "${EXPLOITS}" "${SECURE}" "${PROXYHOST_FULL}"
 				fi
 				echo -en "${idsCL[Default]}"
 				SITELIST[${i}]=${SITENAME}