remove unneeded mappings
adding new nav
rearranging stuff for redesign