[UP-4296] Add support for a 6 column layout.
Merge pull request #468 from jhelmer-unicon/UP-4296_6_col_layout

[UP-4296] Add support for a 6 column layout.