updated with new nav and footer