lots of updates and nav bar