Minor UI tweaks as per conversation with Janelle