nav bar responding to user
merge conflicts