Added some layout enhancements and sync with sfdc configurator