dirty fix for modal layout
Merge pull request #1799 from reciprocity/feature/modal-layout-fixes

dirty fix for modal layout