<riya/vishal> some more ui corrections