diff --git a/src/shared/components/Settings/Tools/Devices/List/Item/index.jsx b/src/shared/components/Settings/Tools/Devices/List/Item/index.jsx
index c550dc7be7..f81e794d98 100644
--- a/src/shared/components/Settings/Tools/Devices/List/Item/index.jsx
+++ b/src/shared/components/Settings/Tools/Devices/List/Item/index.jsx
@@ -25,8 +25,16 @@ export default function Item(props) {
   } = props;
 
   const hasModel = !_.isEmpty(device.model);
-  const secondLine = device.deviceType + (device.manufacturer ? ` | ${device.manufacturer}` : '')
-                                      + (device.operatingSystem ? ` | ${device.operatingSystem}` : '');
+  const secondLineItems = [];
+  if (device.manufacturer) {
+    secondLineItems.push(device.manufacturer);
+  }
+  if (device.operatingSystem) {
+    secondLineItems.push(device.operatingSystem);
+  }
+
+  secondLineItems.push(device.deviceType);
+  const secondLine = secondLineItems.join(' | ');
 
   return (
     <div styleName={cn('container', { isEditing })}>
diff --git a/src/shared/components/Settings/Tools/Devices/index.jsx b/src/shared/components/Settings/Tools/Devices/index.jsx
index 5b6dc7d53b..6309a323c0 100644
--- a/src/shared/components/Settings/Tools/Devices/index.jsx
+++ b/src/shared/components/Settings/Tools/Devices/index.jsx
@@ -103,7 +103,7 @@ export default class Devices extends ConsentComponent {
    * @param indexNo the device index no
    */
   onDeleteDevice(indexNo) {
-    const { deviceTrait } = this.state;
+    const { deviceTrait, isEdit } = this.state;
     const newDeviceTrait = { ...deviceTrait };
     newDeviceTrait.traits.data.splice(indexNo, 1);
     this.setState({
@@ -128,6 +128,9 @@ export default class Devices extends ConsentComponent {
       isSubmit: false,
       formInvalid: false,
     });
+    if (isEdit) {
+      this.onCancelEditStatus();
+    }
   }
 
   /**
@@ -584,7 +587,7 @@ export default class Devices extends ConsentComponent {
                 Don&#39;t see your device?
             </div>
             <div styleName="help-text-email">
-                Contact Support at support@topcoder.com
+                Contact Support at <a href="mailto:support@topcoder.com">support@topcoder.com</a>
             </div>
           </div>
         </div>
@@ -709,7 +712,7 @@ export default class Devices extends ConsentComponent {
                 Don&#39;t see your device?
             </div>
             <div styleName="help-text-email">
-                Contact Support at support@topcoder.com
+                Contact Support at <a href="mailto:support@topcoder.com">support@topcoder.com</a>
             </div>
           </div>
         </div>