Nav updated to fix subnav functionality and account page differences