More layout updates, change from region to constraint for the config and data-app-constraint instead of data-app-region. These changes work with the layout5 branch of app