calendar ui / ux update
merge