Fixing some routing issues and cms_page_content calls