Improving layout of Modular. closes #1284
Merge branch '1274'