Change to device creation so that if a template is set it will pull in all the settings of the template, not just the ones initially displayed to the end user