UI corrected and colors