Corrected menu structure on all pages