Use a two-column grid approach. Closes #471