updated with nav bar