Fixes #276 #277 #279 : calendar UX