Navigation restructure to match Wordpress naming