Lots of nav revamping