Shridhar/Shirish : Few UI improvements