rearranged nav toolbar to the correct order