Fixed navigation issues
Added CMS Support