rearranged nav