Moved map starting point, fixed merge issue
Cleaning up javascript