Merged Old CMS code with new CMS code.
Pending: Update code to use the new theme