Form, stack and spacing update

content-box is taken out; stack pattern added; spacing pattern added