Fix Declarative Services combo box alignment

Also bump the controls decorators out a bit as on Windows they are
directly next to their respective controls.

Signed-off-by: Sean Bright <sean@malleable.com>
Merge pull request #912 from seanbright/bundle-contents-cosmetic

Fix Declarative Services combo box alignment