Affix layout improved.