Fixes #384 and makes better use of the grid whitespace