Fixed UI related bugs

Fixed UI related bugs
Any reason for this change?