Few more UI tweaks