calendar fixes
new calendar layout
cal fixes