Calendar code clean up
Modified list view
Improved list view and minor updates