Fixed layout on HE:pair and improvement