Various fixes for the calendar interface by @hplato

Ready for testing by others.
Merge pull request #362 from hollie/calendar_fixes_hplato

Various fixes for the calendar interface by @hplato