Fixed more menu and header issues

I think all the pages are FINALLY using the same menu and headers.