Reorder Grid columns

resolves #17