UI Color changes and fixed checkmark bug