layout fix
Merge branch 'hotfix-2.5.1'