Fixed UI related bugs

Fixed UI related bugs
discussed on IM.