Some improvements on Calendar Feature