Move Google Maps JS to proper file | Minor UI tweaking
Resolve merge