rearranged nav bar