Calendar UI edge cases

by Annelies