Clean up calendar
Clean up display
Fix merge conflicts