Fixing the site to run properly on server
Revert "Fixing the site to run properly on server"

This reverts commit f28de1b5547fc0d29796d979a84539e589929fc5.