Stabilize Calendar UI

Hopefully fix Calendar UI