Layouts hotfix