Fixed several UI bugs

Fixed the UI bugs mentioned in #204