diff --git a/package-lock.json b/package-lock.json
index 840dbe9..fbb7f6e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1179,6 +1179,14 @@
         "minimist": "^1.2.0"
       }
     },
+    "@createnl/grouped-checkboxes": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@createnl/grouped-checkboxes/-/grouped-checkboxes-1.1.2.tgz",
+      "integrity": "sha512-F4SoFF7UwktrpVeJPs/cQFP5Nn+1wpUm5v1/vzUcgseDGxvjXjLrs+F99ivH/TA3VDJbeFdBPi7gymmw2cessQ==",
+      "requires": {
+        "lodash.debounce": "^4.0.8"
+      }
+    },
     "@csstools/convert-colors": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/@csstools/convert-colors/-/convert-colors-1.4.0.tgz",
diff --git a/package.json b/package.json
index 2910036..af5f894 100644
--- a/package.json
+++ b/package.json
@@ -5,6 +5,7 @@
   "dependencies": {
     "@fortawesome/fontawesome-svg-core": "^1.2.32",
     "@fortawesome/free-solid-svg-icons": "^5.15.1",
+    "@createnl/grouped-checkboxes": "^1.1.2",
     "@fortawesome/react-fontawesome": "^0.1.13",
     "babel-runtime": "^6.26.0",
     "bootstrap": "^4.5.3",
diff --git a/src/common/table.js b/src/common/table.js
index 400bffe..8774d10 100644
--- a/src/common/table.js
+++ b/src/common/table.js
@@ -34,7 +34,8 @@ class CustomTable extends Component {
   }
 
   static defaultProps = {
-    width: null
+    width: null,
+    checked: true
   };
 
   onClick(event, row, column) {
diff --git a/src/signal/edit-signal-mapping.js b/src/signal/edit-signal-mapping.js
index 82a8442..7dec36a 100644
--- a/src/signal/edit-signal-mapping.js
+++ b/src/signal/edit-signal-mapping.js
@@ -17,7 +17,7 @@
 
 import React from 'react';
 import PropTypes from 'prop-types';
-import {Button, FormGroup, FormLabel, FormText} from 'react-bootstrap';
+import {Button, FormGroup, FormLabel, FormText, OverlayTrigger, Tooltip} from 'react-bootstrap';
 import {Collapse} from 'react-collapse';
 import Table from '../common/table';
 import TableColumn from '../common/table-column';
@@ -64,6 +64,11 @@ class EditSignalMapping extends React.Component {
     }
   }
 
+  signals.forEach(signal => {
+    if(signal.checked == undefined) signal.checked = false
+  });
+
+
     return {
       signals: signals,
     };
@@ -134,6 +139,21 @@ class EditSignalMapping extends React.Component {
 
   };
 
+  handleRemove = () => {
+
+    let checkedSignals = this.state.signals.filter(signal => signal.checked === true);
+
+    checkedSignals.forEach(signal => {
+      AppDispatcher.dispatch({
+        type: 'signals/start-remove',
+        data: signal,
+        token: this.props.sessionToken
+      });
+  
+    })
+
+  }
+
   handleAdd = (configID = null) => {
 
     if(typeof this.props.configs !== "undefined"){
@@ -173,6 +193,34 @@ class EditSignalMapping extends React.Component {
       this.setState({signals: signals})
   }
 
+  onSignalChecked(signal) {
+    let tempSignals = this.state.signals;
+    const index = tempSignals.indexOf(signal);
+    
+    tempSignals[index].checked = !tempSignals[index].checked;
+
+    this.setState({signals: tempSignals});
+    
+  }
+
+  checkAll(){
+    let tempSignals = this.state.signals;
+    let allChecked = true;
+
+    tempSignals.forEach(signal =>
+      { 
+        if(signal.checked === false){
+        signal.checked = true;
+        allChecked = false;
+      }
+      });
+
+    if(allChecked){
+      tempSignals.forEach(signal => signal.checked = false);
+    }
+    this.setState({signals: tempSignals});
+  }
+
   render() {
 
       const buttonStyle = {
@@ -185,7 +233,7 @@ class EditSignalMapping extends React.Component {
           show={this.props.show}
           title="Edit Signal Mapping"
           buttonTitle="Save"
-          blendOutCancel = {true}
+          blendOutCancel = {false}
           onClose={(c) => this.onClose(c)}
           onReset={() => this.resetState()}
           valid={true}
@@ -194,7 +242,8 @@ class EditSignalMapping extends React.Component {
           <FormGroup>
               <FormLabel>{this.props.direction} Mapping</FormLabel>
               <FormText>Click <i>Index</i>, <i>Name</i> or <i>Unit</i> cell to edit</FormText>
-              <Table data={this.state.signals}>
+              <Table checkbox onChecked={(signal) => this.onSignalChecked(signal)} data={this.state.signals}>
+                  <TableColumn checkbox onChecked={(index, event) => this.onSignalChecked(index, event)} checkboxKey='checked' width='30' />
                   <TableColumn title='Index' dataKey='index' inlineEditable inputType='number' onInlineChange={(e, row, column) => this.handleMappingChange(e, row, column)} />
                   <TableColumn title='Name' dataKey='name' inlineEditable inputType='text' onInlineChange={(e, row, column) => this.handleMappingChange(e, row, column)} />
                   <TableColumn title='Unit' dataKey='unit' inlineEditable inputType='text' onInlineChange={(e, row, column) => this.handleMappingChange(e, row, column)} />
@@ -202,8 +251,12 @@ class EditSignalMapping extends React.Component {
                   <TableColumn title='Remove' deleteButton onDelete={(index) => this.handleDelete(index)} />
               </Table>
 
-              <div style={{ float: 'right' }}>
-                <Button key={50} onClick={() => this.handleAdd()} style={buttonStyle}><Icon icon="plus" /> Signal</Button>
+              <div >
+              <OverlayTrigger key={0} placement={'left'} overlay={<Tooltip id={`tooltip-${"check"}`}> Check/Uncheck All </Tooltip>} >
+                <Button key={50} style={{ float: 'left' }} onClick={() => this.checkAll()} style={buttonStyle}> <Icon icon="check" />  </Button>
+              </OverlayTrigger>
+                <Button key={51} style={{ float: 'left' }} onClick={() => this.handleRemove()} style={buttonStyle}> Remove </Button>
+                <Button key={52} style={{ float: 'right' }} onClick={() => this.handleAdd()} style={buttonStyle}><Icon icon="plus" /> Signal </Button>
               </div>
               <div>
                 <Collapse isOpened={this.state.openCollapse}>