UI tweaks requested by Tom