calendar, modal fixes, UP