Updates to calendar modal and user model