Add map to home

Let's merge this feature branch into master