Multiple UI fixes as per meeting.