Header alignment fixes