Various changes to Nav and product