Add map, fix button padding.