Improved maps
Improved behavior of fixed menu
Add maps