Fixed UI issues <Praveen>