Some aesthetic changes
Removed the calendar