Merged Create and David_calendar branches

Implement calendar page and create page