Added category handling in cmscontroller and default theme