Fixing some UI bugs.