Fixing some UI issues