Added site handler, refactored url routes