Improved Calendar layout