Form and margin changes
Merge remote-tracking branch 'origin/candice-theme'