Add map selection, make display nicer