ENHANCEMENT: Add a more robust layout solution
Merge pull request #48 from nedmas/grid-layout

ENHANCEMENT: Add a more robust layout solution