Fix layout.go in regard to new padding and margin

The merged `layout.go` file had references to the old padding and margin code. This should fix the build problem and work as expected.