Updates to some of the configuration layouts
Merge branch 'staging' of github.com:cobaltcrm/cobalt into staging