changed nav bar
fixed conflict