Fixes #17 by making sure the extra 3 column layout is supported correctly