Made nav bar fixed
Merging with Eric updates