Clean up new navigation templates
What does this MR do?
Cleans up our templates by removing usages of show_new_nav?
Moves the new templates into the original templates & then removes the new ones.
What are the relevant issue numbers?
Edited by Phil Hughes