changed nav bar
fixed merge conflicts