Update layouts, move Nearbys under maps, remove navigation bars