More usability tweaks