diff --git a/Lutron RadioRA 2.indigoPlugin/Contents/Server Plugin/Devices.xml b/Lutron RadioRA 2.indigoPlugin/Contents/Server Plugin/Devices.xml
index 4769714..91202e0 100644
--- a/Lutron RadioRA 2.indigoPlugin/Contents/Server Plugin/Devices.xml	
+++ b/Lutron RadioRA 2.indigoPlugin/Contents/Server Plugin/Devices.xml	
@@ -172,12 +172,11 @@
     <Device type="relay" id="ra2Keypad">
         <Name>Lutron Keypad</Name>
         <ConfigUI>
-            <Field id="isButton" type="checkbox" defaultValue="True" hidden="true"/>
-            <Field id="listType" type="menu"     defaultValue="button">
+            <Field id="isButton" type="menu" defaultValue="true">
                <Label>Type:</Label>
                 <List>
-                    <Option value="button">Keypad Button</Option>
-                    <Option value="LED">Keypad LED</Option>
+                    <Option value="true">Keypad Button</Option>
+                    <Option value="false">Keypad LED</Option>
                 </List>
             </Field>
             <Field id="gateway" type="menu">
@@ -203,10 +202,10 @@
                 <Title>Add Room</Title>
                 <CallbackMethod>do_add_room</CallbackMethod>
             </Field>
-           <Field id="keypadButtonDisplayLEDState" type="checkbox" defaultValue="false" visibleBindingId="listType" visibleBindingValue="LED">
+           <Field id="keypadButtonDisplayLEDState" type="checkbox" defaultValue="false" visibleBindingId="isButton" visibleBindingValue="false"  alwaysUseInDialogHeightCalc="true">
                 <Label>Display LED state instead of button press status:</Label>
             </Field>
-            <Field id="LEDhelp" type="label" enabledBindingId="keypadButtonDisplayLEDState" alignWithControl="keypadButtonDisplayLEDState" visibleBindingId="keypadButtonDisplayLEDState" visibleBindingValue="true" fontColor="orange">
+            <Field id="LEDhelp" type="label" enabledBindingId="keypadButtonDisplayLEDState" alignWithControl="keypadButtonDisplayLEDState" visibleBindingId="keypadButtonDisplayLEDState" visibleBindingValue="true" fontColor="orange" alwaysUseInDialogHeightCalc="true">
                 <Label>Display LED state option selected.  Please make sure a button corresponding to this LED has also been defined in Indigo.  For example, if you added LED 81, make sure you also added Button 1.  LED 82 corresponds to Button 2, etc.</Label>
             </Field>
         </ConfigUI>
diff --git a/Lutron RadioRA 2.indigoPlugin/Contents/Server Plugin/plugin.py b/Lutron RadioRA 2.indigoPlugin/Contents/Server Plugin/plugin.py
index f39135a..9eb54a6 100644
--- a/Lutron RadioRA 2.indigoPlugin/Contents/Server Plugin/plugin.py	
+++ b/Lutron RadioRA 2.indigoPlugin/Contents/Server Plugin/plugin.py	
@@ -46,7 +46,6 @@
 PROP_EVENT = "event"
 PROP_GROUP = "group"
 PROP_CCO_TYPE = "ccoType"
-PROP_LIST_TYPE = "listType"
 PROP_KEYPADBUT_DISPLAY_LED_STATE = "keypadButtonDisplayLEDState"
 PROP_SUPPORTS_STATUS_REQUEST = "SupportsStatusRequest"
 PROP_BUTTONTYPE = "ButtonType"
@@ -2241,7 +2240,6 @@ def createCasetaDevices(self, valuesDict):
 
                     props = {
                         PROP_ROOM: areaName,
-                        PROP_LIST_TYPE: "button",
                         PROP_GATEWAY: gatewayID,
                         PROP_INTEGRATION_ID: str(device["ID"]),
                         PROP_COMPONENT_ID: str(button["Number"]),
@@ -2513,7 +2511,6 @@ def createRRA2Devices(self, valuesDict):
                                 buttonType = "Unknown"
                             props = {
                                 PROP_ROOM: room.attrib['Name'],
-                                PROP_LIST_TYPE: "button",
                                 PROP_GATEWAY: gatewayID,
                                 PROP_INTEGRATION_ID: device.attrib['IntegrationID'],
                                 PROP_COMPONENT_ID: component.attrib['ComponentNumber'],
@@ -2537,7 +2534,6 @@ def createRRA2Devices(self, valuesDict):
                             address = gatewayID + ":" + device.attrib['IntegrationID'] + "." + keypadLED
                             props = {
                                 PROP_ROOM: room.attrib['Name'],
-                                PROP_LIST_TYPE: "LED",
                                 PROP_GATEWAY: gatewayID,
                                 PROP_INTEGRATION_ID: device.attrib['IntegrationID'],
                                 PROP_COMPONENT_ID: keypadLED,
@@ -2573,7 +2569,6 @@ def createRRA2Devices(self, valuesDict):
                                 buttonType = "Unknown"
                             props = {
                                 PROP_ROOM: room.attrib['Name'],
-                                PROP_LIST_TYPE: "button",
                                 PROP_GATEWAY: gatewayID,
                                 PROP_INTEGRATION_ID: device.attrib['IntegrationID'],
                                 PROP_COMPONENT_ID: component.attrib['ComponentNumber'],
@@ -2590,7 +2585,6 @@ def createRRA2Devices(self, valuesDict):
                             address = gatewayID + ":" + device.attrib['IntegrationID'] + "." + keypadLED
                             props = {
                                 PROP_ROOM: room.attrib['Name'],
-                                PROP_LIST_TYPE: "LED",
                                 PROP_GATEWAY: gatewayID,
                                 PROP_INTEGRATION_ID: device.attrib['IntegrationID'],
                                 PROP_COMPONENT_ID: keypadLED,