Improved calendar design