Fixing several UI bugs