UI changes and few other fixes