A few updates to mapLayout. Move bar buttons from navbar to toolbar