CMS navigation fix
controller updates