Some calendar display updates...still not perfect.