Consolidate default and calendar layouts
Add calendar integration