adding new paths
fixing sub nav context
merge fix