Improved Calendar control