Modified header hooks to take into account the new method of doing heading options