Fixing UI bugs.