fix up header menu, remove some unnecessary bits, make other bits work