Few user interface tweaks