Fixed the UI bugs
Fixed the UI bugs