[Settings][Calendar] Some fixing