Map is a true class now

1. Also partially updated map layout.
Updated State to the new Map behavior