Rearrange subheader links a bit