Updated to new version of dynamic navigation