Grid columns (feature)

Feature branch for #14 and #23