Fixing some UI problems