diff --git a/react/src/App.js b/react/src/App.js
index 6a8ad8f..557c437 100644
--- a/react/src/App.js
+++ b/react/src/App.js
@@ -99,19 +99,47 @@ function AddressForm() {
                             }
                         />
                     </label>
-                    <label>
-                        <p className="label">
-                        Current Heating Fuel:
-                        </p>
-                        <input type="radio" name="fuel" value="fuel_oil" onChange={onFuelChange} />
-                        Fuel Oil
-                        <input type="radio" name="fuel" value="natural_gas" onChange={onFuelChange} defaultChecked={true} />
-                        Natural Gas
-                        <input type="radio" name="fuel" value="propane" onChange={onFuelChange} />
-                        Propane
-                        <input type="radio" name="fuel" value="electricity" onChange={onFuelChange} />
-                        Electricity
-                    </label>
+                    <br/><br/>
+                    <fieldset id="fuels">
+                        <legend className="label">Current Heating Fuel:</legend>
+                        <label>
+                            <input
+                                type="radio"
+                                name="fuel"
+                                value="fuel_oil"
+                                onChange={onFuelChange}
+                            />
+                            Fuel Oil
+                        </label>
+                        <label>
+                            <input
+                                type="radio"
+                                name="fuel"
+                                value="natural_gas"
+                                onChange={onFuelChange}
+                                defaultChecked={true}
+                            />
+                            Natural Gas
+                        </label>
+                        <label>
+                            <input
+                                type="radio"
+                                name="fuel"
+                                value="propane"
+                                onChange={onFuelChange}
+                            />
+                            Propane
+                        </label>
+                        <label>
+                            <input
+                                type="radio"
+                                name="fuel"
+                                value="electricity"
+                                onChange={onFuelChange}
+                            />
+                            Electricity
+                        </label>
+                        </fieldset>
                     <br/><br/>
                     <label>
                         <input type="submit" value="OK"/>
diff --git a/react/src/styles.css b/react/src/styles.css
index 654ca6d..783e8fa 100644
--- a/react/src/styles.css
+++ b/react/src/styles.css
@@ -45,10 +45,16 @@ html, body {
 #address {
     margin-left: auto;
     margin-right: auto;
-    width: 400px;
+    width: 460px;
+    border-width: 3;
     font-size: 12pt;
 }
 
+#fuels {
+    width: 440px;
+    padding: 10px;
+}
+
 #ok {
     width: 80px;
 }