One last tweak on the Calendar selector