Default location changed to Toronto
JS clean up, adding seperate js file