Updated JS and HTML markup on navigation