Instead of padding the container, pad individual elements that need it. This enables us to have highlighting (e.g. on hover) that spans the full width of the controlbox. updates #1069