+Vishal Some more UI tweaks. WIP