- Fixing UI bugs