UPDATED: Rearranged nav menu