Map improvements
Changed the right menu to use JSON data