UI tweaks and updates