Devices dialog layout fix

must be applied after #124