diff --git a/resources/mac-address.json b/resources/mac-address.json
index 73e45f53..d3243be0 100644
--- a/resources/mac-address.json
+++ b/resources/mac-address.json
@@ -1,6 +1,6 @@
 {
-  "gcs": ["0013A20040917A31"],
-  "uav": "",
+  "isr": "",
+  "ipd": "",
   "ugv": "",
   "vtol": ""
 }
diff --git a/src/renderer/index.js b/src/renderer/index.js
index 3c8e7cf8..b9d15867 100644
--- a/src/renderer/index.js
+++ b/src/renderer/index.js
@@ -3,10 +3,10 @@ import React, { Component } from 'react';
 import ReactDOM from 'react-dom';
 
 import { fixtures, geolocation } from '../../resources/index.js';
-import LogContainer from './log/Log.js';
-import MapContainer from './map/Map.js';
-import MissionContainer from './mission/Mission.js';
-import VehicleContainer from './vehicle/Vehicle.js';
+import LogContainer from './log/LogContainer.js';
+import MapContainer from './map/MapContainer.js';
+import MissionContainer from './mission/MissionContainer.js';
+import VehicleContainer from './vehicle/VehicleContainer.js';
 
 import 'leaflet/dist/leaflet.css';
 import 'react-virtualized/styles.css';
diff --git a/src/renderer/log/Log.js b/src/renderer/log/LogContainer.js
similarity index 100%
rename from src/renderer/log/Log.js
rename to src/renderer/log/LogContainer.js
diff --git a/src/renderer/map/Map.js b/src/renderer/map/MapContainer.js
similarity index 100%
rename from src/renderer/map/Map.js
rename to src/renderer/map/MapContainer.js
diff --git a/src/renderer/mission/Mission.js b/src/renderer/mission/MissionContainer.js
similarity index 100%
rename from src/renderer/mission/Mission.js
rename to src/renderer/mission/MissionContainer.js
diff --git a/src/renderer/vehicle/VehicleContainer.js b/src/renderer/vehicle/VehicleContainer.js
new file mode 100644
index 00000000..1de1e62d
--- /dev/null
+++ b/src/renderer/vehicle/VehicleContainer.js
@@ -0,0 +1,19 @@
+import React, { Component } from 'react';
+
+import VehicleTable from './VehicleTable.js';
+
+import './vehicle.css';
+
+export default class VehicleContainer extends Component {
+  state = {
+    xbeeConnected: false,
+  };
+
+  render() {
+    return (
+      <div className='vehicleContainer container'>
+        {<VehicleTable />}
+      </div>
+    );
+  }
+}
diff --git a/src/renderer/vehicle/Vehicle.js b/src/renderer/vehicle/VehicleTable.js
similarity index 51%
rename from src/renderer/vehicle/Vehicle.js
rename to src/renderer/vehicle/VehicleTable.js
index 6fd94850..cdffc518 100644
--- a/src/renderer/vehicle/Vehicle.js
+++ b/src/renderer/vehicle/VehicleTable.js
@@ -2,10 +2,7 @@ import { ipcRenderer } from 'electron';
 import React, { Component } from 'react';
 import { AutoSizer, Table, Column } from 'react-virtualized';
 
-import './vehicle.css';
-
-
-export default class VehicleContainer extends Component {
+export default class VehicleTable extends Component {
   state = {
     vehicles: {},
   };
@@ -46,38 +43,41 @@ export default class VehicleContainer extends Component {
 
   render() {
     return (
-      <div className='vehicleContainer container'>
-        <AutoSizer>
-          {({ height, width }) =>
-            <Table
-              width={width}
-              height={height}
-              headerHeight={40}
-              rowHeight={40}
-              rowCount={Object.keys(this.state.vehicles).length}
-              rowGetter={this.rowGetter}
-              onRowClick={this.onRowClick}
-            >
-              <Column
-                label='ID'
-                dataKey='id'
-                width={width * this.width.id}
-              />
-              <Column
-                label='Name'
-                dataKey='name'
-                width={width * this.width.name}
-              />
-              <Column
-                label='Status'
-                dataKey='status'
-                width={width * this.width.status}
-                cellRenderer={this.statusRenderer}
-              />
-            </Table>
-          }
-        </AutoSizer>
-      </div>
+      <AutoSizer>
+        {({ height, width }) =>
+          <Table
+            style={{
+              position: 'relative',
+              top: 0,
+              right: 0,
+            }}
+            width={width}
+            height={height}
+            headerHeight={40}
+            rowHeight={40}
+            rowCount={Object.keys(this.state.vehicles).length}
+            rowGetter={this.rowGetter}
+            onRowClick={this.onRowClick}
+          >
+            <Column
+              label='ID'
+              dataKey='id'
+              width={width * this.width.id}
+            />
+            <Column
+              label='Name'
+              dataKey='name'
+              width={width * this.width.name}
+            />
+            <Column
+              label='Status'
+              dataKey='status'
+              width={width * this.width.status}
+              cellRenderer={this.statusRenderer}
+            />
+          </Table>
+        }
+      </AutoSizer>
     );
   }
 }
diff --git a/src/renderer/vehicle/XbeeConnectContainer.js b/src/renderer/vehicle/XbeeConnectContainer.js
new file mode 100644
index 00000000..af74ee83
--- /dev/null
+++ b/src/renderer/vehicle/XbeeConnectContainer.js
@@ -0,0 +1,7 @@
+import React, { Component } from 'react';
+
+export default class XbeeConnectContainer extends Component {
+  render() {
+    return <div />;
+  }
+}