calendar page fixes