diff --git a/lemper.sh b/lemper.sh
index a72f282..2c802aa 100755
--- a/lemper.sh
+++ b/lemper.sh
@@ -145,11 +145,11 @@ case $1 in
         # Remove PHP
         echo -e "\nUninstalling PHP FPM...\n"
 
-        if [[ -n $(which which php-fpm5.6) \
-            || -n $(which which php-fpm7.0) \
-            || -n $(which which php-fpm7.1) \
-            || -n $(which which php-fpm7.2) \
-            || -n $(which which php-fpm7.3) ]]; then
+        if [[ -n $(which php-fpm5.6) \
+            || -n $(which php-fpm7.0) \
+            || -n $(which php-fpm7.1) \
+            || -n $(which php-fpm7.2) \
+            || -n $(which php-fpm7.3) ]]; then
             # Stop php5-fpm server
             service php5.6-fpm stop
             service php7.0-fpm stop
diff --git a/scripts/install_tools.sh b/scripts/install_tools.sh
index 16a163f..1300966 100755
--- a/scripts/install_tools.sh
+++ b/scripts/install_tools.sh
@@ -39,7 +39,7 @@ LEMPer and ngxTools support is available at
 
 <p><em>Thank you for using nginx, ngxTools, and LEMPer.</em></p>
 
-<p style="font-size:90%;">Generated using <em>LEMPer</em> from <a href="https://ngxtools.eslabs.id/">Nginx vHost Tool</a>, a simple nginx web server management tool.</p>
+<p style="font-size:90%;">Generated using <em>LEMPer</em> from <a href="https://eslabs.id/lemper">Nginx vHost Tool</a>, a simple nginx web server management tool.</p>
 </body>
 </html>
 _EOF_
@@ -55,6 +55,7 @@ run chmod ugo+x /usr/local/bin/ngxtool
 run mkdir /usr/share/nginx/html/tools/
 
 create_index_file > /usr/share/nginx/html/index.html
+create_index_file > /usr/share/nginx/html/tools/index.html
 
 # Install PHP Info
 #cat > /usr/share/nginx/html/tools/phpinfo.php <<EOL
@@ -84,6 +85,8 @@ run wget -q http://www.filerun.com/download-latest -O FileRun.zip
 run unzip -qq FileRun.zip -d /usr/share/nginx/html/tools/filerun/
 run rm -f FileRun.zip
 
+# TODO: try Tinyfilemanager https://github.com/prasathmani/tinyfilemanager
+
 # Assign ownership properly
 run chown -hR www-data:root /usr/share/nginx/html/tools/
 
diff --git a/scripts/ngxtool.sh b/scripts/ngxtool.sh
index fc55303..144edce 100755
--- a/scripts/ngxtool.sh
+++ b/scripts/ngxtool.sh
@@ -1,19 +1,19 @@
 #!/bin/bash
 
-#  +------------------------------------------------------------------------+
-#  | NgxVhost - Simple Nginx vHost Configs File Generator                   |
-#  +------------------------------------------------------------------------+
-#  | Copyright (c) 2014-2019 NgxTools (https://ngxtools.eslabs.id)          |
-#  +------------------------------------------------------------------------+
-#  | This source file is subject to the New BSD License that is bundled     |
-#  | with this package in the file docs/LICENSE.txt.                        |
-#  |                                                                        |
-#  | If you did not receive a copy of the license and are unable to         |
-#  | obtain it through the world-wide-web, please send an email             |
-#  | to license@eslabs.id so we can send you a copy immediately.            |
-#  +------------------------------------------------------------------------+
-#  | Authors: Edi Septriyanto <eslabs.id@gmail.com>                         |
-#  +------------------------------------------------------------------------+
+# +-------------------------------------------------------------------------+
+# | NgxVhost - Simple Nginx vHost Configs File Generator                    |
+# +-------------------------------------------------------------------------+
+# | Copyright (c) 2014-2019 NgxTools (https://ngxtools.eslabs.id)           |
+# +-------------------------------------------------------------------------+
+# | This source file is subject to the GNU General Public License           |
+# | that is bundled with this package in the file LICENSE.md.               |
+# |                                                                         |
+# | If you did not receive a copy of the license and are unable to          |
+# | obtain it through the world-wide-web, please send an email              |
+# | to license@eslabs.id so we can send you a copy immediately.             |
+# +-------------------------------------------------------------------------+
+# | Authors: Edi Septriyanto <eslabs.id@gmail.com>                          |
+# +-------------------------------------------------------------------------+
 
 # Version Control
 APP_NAME=$(basename "$0")
diff --git a/scripts/ngxvhost.sh b/scripts/ngxvhost.sh
index 38147a0..9f860ad 100755
--- a/scripts/ngxvhost.sh
+++ b/scripts/ngxvhost.sh
@@ -1,20 +1,20 @@
 #!/bin/bash
 
-#  +------------------------------------------------------------------------+
-#  | NgxVhost - Simple Nginx vHost Configs File Generator                   |
-#  +------------------------------------------------------------------------+
-#  | Copyright (c) 2014-2019 NgxTools (https://ngxtools.eslabs.id)          |
-#  +------------------------------------------------------------------------+
-#  | This source file is subject to the New BSD License that is bundled     |
-#  | with this package in the file docs/LICENSE.txt.                        |
-#  |                                                                        |
-#  | If you did not receive a copy of the license and are unable to         |
-#  | obtain it through the world-wide-web, please send an email             |
-#  | to license@eslabs.id so we can send you a copy immediately.            |
-#  +------------------------------------------------------------------------+
-#  | Authors: Edi Septriyanto <eslabs.id@gmail.com>                         |
-#  |          Fideloper <https://gist.github.com/fideloper/9063376>         |
-#  +------------------------------------------------------------------------+
+# +-------------------------------------------------------------------------+
+# | NgxVhost - Simple Nginx vHost Configs File Generator                    |
+# +-------------------------------------------------------------------------+
+# | Copyright (c) 2014-2019 NgxTools (https://ngxtools.eslabs.id)           |
+# +-------------------------------------------------------------------------+
+# | This source file is subject to the GNU General Public License           |
+# | that is bundled with this package in the file LICENSE.md.               |
+# |                                                                         |
+# | If you did not receive a copy of the license and are unable to          |
+# | obtain it through the world-wide-web, please send an email              |
+# | to license@eslabs.id so we can send you a copy immediately.             |
+# +-------------------------------------------------------------------------+
+# | Authors: Edi Septriyanto <eslabs.id@gmail.com>                          |
+# | Forked from Fideloper <https://gist.github.com/fideloper/9063376>       |
+# +-------------------------------------------------------------------------+
 
 # Version Control
 APP_NAME=$(basename "$0")