Calendar Ui + Modal fix