Merge branch 'style-nav-and-map'