Modal layout changes
Merge pull request #891 from brooksryba/develop

Modal layout changes