Changed calendar controller and view structure

Altered controller and views to separate content. Had to reorder css
links to fix error.