changed order of service catalog and device environment fields

changed order of service catalog and device environment fields