handful of design tweaks requested by @mebates