diff --git a/src/components/touchlink-page/index.tsx b/src/components/touchlink-page/index.tsx
index 90ffb9365..feb83c388 100644
--- a/src/components/touchlink-page/index.tsx
+++ b/src/components/touchlink-page/index.tsx
@@ -10,6 +10,8 @@ import cx from "classnames";
 import { Link } from "react-router-dom";
 import { TouchlinkApi } from "../../actions/TouchlinkApi";
 import { WithTranslation, withTranslation } from "react-i18next";
+import { Column } from "react-table";
+import { Table } from "../grid/ReactTableCom";
 
 
 
@@ -28,39 +30,45 @@ export class TouchlinkPage extends Component<TouchlinkApi & GlobalState & WithTr
     renderTouchlinkDevices(): JSX.Element {
         const { touchlinkDevices, devices, touchlinkIdentifyInProgress, touchlinkResetInProgress, t } = this.props;
         const touchlinkInProgress = touchlinkIdentifyInProgress || touchlinkResetInProgress;
+        const columns: Column<TouchLinkDevice>[] = [
+            {
+                Header: t('zigbee:ieee_address') as string,
+                accessor: (touchlinkDevice) => touchlinkDevice.ieee_address,
+                Cell: ({ row: { original: touchlinkDevice } }) => devices[touchlinkDevice.ieee_address] ?
+                    (<Link to={genDeviceDetailsLink(touchlinkDevice.ieee_address)}>{touchlinkDevice.ieee_address}</Link>) : touchlinkDevice.ieee_address
+
+            },
+            {
+                Header: t('zigbee:friendly_name') as string,
+                accessor: (touchlinkDevice) => devices[touchlinkDevice.ieee_address]?.friendly_name,
+            },
+            {
+                id: 'channel',
+                Header: t('zigbee:channel') as string,
+                accessor: 'channel'
+
+            },
+
+            {
+                id: 'actions',
+                Header: '',
+                Cell: ({ row: { original: touchlinkDevice } }) => {
+                    return (
+                        <div className="btn-group float-right" role="group" aria-label="Basic example">
+                            <Button<TouchLinkDevice> disabled={touchlinkInProgress} item={touchlinkDevice} title={t('identify')} className="btn btn-primary" onClick={this.onIdentifyClick}><i
+                                className={cx("fa", { "fa-exclamation-triangle": !touchlinkIdentifyInProgress, "fas fa-circle-notch fa-spin": touchlinkIdentifyInProgress })} /></Button>
+                            <Button<TouchLinkDevice> disabled={touchlinkInProgress} item={touchlinkDevice} title={t('factory_reset')} className="btn btn-danger" onClick={this.onResetClick}><i
+                                className={cx("fa", { "fa-broom": !touchlinkResetInProgress, "fas fa-circle-notch fa-spin": touchlinkResetInProgress })} /></Button>
+                        </div>
+                    )
+                }
+            },
+
+
+        ];
         return (
             <div className="table-responsive">
-                <table className="table align-middle">
-                    <thead>
-                        <tr>
-                            <th scope="col">#</th>
-                            <th scope="col">{t('zigbee:ieee_address')}</th>
-                            <th scope="col">{t('zigbee:friendly_name')}</th>
-                            <th scope="col">{t('zigbee:channel')}</th>
-                            <th scope="col">&nbsp;</th>
-                        </tr>
-                    </thead>
-                    <tbody>
-                        {touchlinkDevices.map((touchlinkDevice, idx) => (
-                            <tr key={touchlinkDevice.ieee_address}>
-                                <td>{idx + 1}</td>
-                                <td>{
-                                    devices[touchlinkDevice.ieee_address] ?
-                                        (<Link to={genDeviceDetailsLink(touchlinkDevice.ieee_address)}>{touchlinkDevice.ieee_address}</Link>) : touchlinkDevice.ieee_address}</td>
-                                <td>{devices[touchlinkDevice.ieee_address]?.friendly_name}</td>
-                                <td>{touchlinkDevice.channel}</td>
-                                <td>
-                                    <div className="btn-group float-right" role="group" aria-label="Basic example">
-                                        <Button<TouchLinkDevice> disabled={touchlinkInProgress} item={touchlinkDevice} title={t('identify')} className="btn btn-primary" onClick={this.onIdentifyClick}><i
-                                            className={cx("fa", { "fa-exclamation-triangle": !touchlinkIdentifyInProgress, "fas fa-circle-notch fa-spin": touchlinkIdentifyInProgress })} /></Button>
-                                        <Button<TouchLinkDevice> disabled={touchlinkInProgress} item={touchlinkDevice} title={t('factory_reset')} className="btn btn-danger" onClick={this.onResetClick}><i
-                                            className={cx("fa", { "fa-broom": !touchlinkResetInProgress, "fas fa-circle-notch fa-spin": touchlinkResetInProgress })} /></Button>
-                                    </div>
-                                </td>
-                            </tr>
-                        ))}
-                    </tbody>
-                </table>
+                <Table columns={columns} data={touchlinkDevices} />
             </div>
         );
     }
diff --git a/src/i18n/locales/en.json b/src/i18n/locales/en.json
index 14c8cf117..4968d643c 100644
--- a/src/i18n/locales/en.json
+++ b/src/i18n/locales/en.json
@@ -375,7 +375,8 @@
         "update_Home_assistant_entity_id": "Update Home Assistant entity ID",
         "zigbee_manufacturer": "Zigbee Manufacturer",
         "zigbee_model": "Zigbee Model",
-        "device": "Device"
+        "device": "Device",
+        "channel": "Channel"
     },
     "scene": {
         "scene_id": "Scene ID",
diff --git a/ws-messages/onTouchlink.json b/ws-messages/onTouchlink.json
new file mode 100644
index 000000000..9eb6748ee
--- /dev/null
+++ b/ws-messages/onTouchlink.json
@@ -0,0 +1,18 @@
+{
+    "payload": {
+        "status": "ok",
+        "data": {
+            "found": [
+                {
+                    "ieee_address": "xxxxx",
+                    "channel": 1
+                },
+                {
+                    "ieee_address": "0x00124b001e73227f",
+                    "channel": 10
+                }
+            ]
+        }
+    },
+    "topic": "bridge/response/touchlink/scan"
+}
\ No newline at end of file
diff --git a/ws.js b/ws.js
index 373fc94e6..b37082676 100644
--- a/ws.js
+++ b/ws.js
@@ -1,6 +1,6 @@
 const WebSocket = require("ws");
 const lineReader = require('line-reader');
-
+const fs = require("fs");
 const wss = new WebSocket.Server({
     port: 8579,
 });
@@ -15,9 +15,10 @@ wss.on("connection", (ws) => {
         const msg = JSON.parse(message.data);
         switch (msg.topic) {
             case "bridge/request/networkmap":
-                lineReader.eachLine('./ws-messages/networkMapRequest.json', (line, last) => {
-                    ws.send(line);
-                });
+                ws.send(fs.readFileSync('./ws-messages/networkMapRequest.json', 'utf8'));
+                break;
+            case "bridge/request/touchlink/scan":
+                ws.send(fs.readFileSync('./ws-messages/onTouchlink.json', 'utf8'));
                 break;
             default:
                 break;