Added Back button to nav bar
fixed merge