DJR:Refactored controllers
DJR:Refactored views
DJR:Completed adding objects from CMS