calendar color fix and UI tweak