A few usability tweaks