Reduce some errors
Small UI Changes