Moved more stuff around in the map.js c;ass
Completed the merge