Respect gutters

WIP for #204