1.4 hotfix

Layout fixes