UI tweaks to increase usability