This fixes #692. 

Trying to bootstrap style it, but a real designer would do a better job.