header/menu fixes and improvements