Add "connect gaps" checkbox, move labels out