Fix some UI bugs.
Fix whitespace removal.