Improve calendar design