Fixing issues with UI.