UI tweaks to improve usability