Improve visuals

I think this considerably improves the default display, while adding minimal extra complexity to the code.