Improved the input of properties for devices, using 2 separate fields