Fixed UI related bugs

Fixed UI related bugs
Add comment about the reason