rearranged navigation menu