Merge "Fixed some UI bugs"