Adding UI tweaks