Fixing some UI issues across the application