Fix Maps, Include Nav-Drawer, Include Preferences Menu

nothing omre to say.