Calendar design changes

Follow