UI improvement for first_cal