Just some Usability tweaks