Fix header options positioning on different layouts