Improve map display layout and styling

Before/after:

![Before and after](http://i.imgur.com/3NvI3pf.png)