Add map view -- a little refactoring