diff --git a/mavlink/mavManager.js b/mavlink/mavManager.js
index 2673fd93..22ba5e21 100644
--- a/mavlink/mavManager.js
+++ b/mavlink/mavManager.js
@@ -106,6 +106,13 @@ class mavManager {
         data.targetComponent === minimal.MavComponent.ONBOARD_COMPUTER &&
         packet.header.msgid === common.CommandLong.MSG_ID) {
         console.log('Received CommandLong addressed to onboard computer')
+
+      // Or the attached camera
+      } else if (data.targetSystem === this.targetSystem &&
+        data.targetComponent === minimal.MavComponent.CAMERA &&
+        packet.header.msgid === common.CommandLong.MSG_ID) {
+        console.log('Received CommandLong addressed to attached camera')
+
       } else if (this.targetSystem !== packet.header.sysid) {
         // don't use packets from other systems or components in Rpanion-server
         return
@@ -251,26 +258,49 @@ class mavManager {
     })
   }
 
-  sendHeartbeat (mavType = minimal.MavType.ONBOARD_CONTROLLER,
-    autopilot = minimal.MavAutopilot.INVALID,
-    baseMode = 0,
-    customMode = 0,
-    systemStatus = 0,
-    component = minimal.MavComponent.ONBOARD_COMPUTER) {
-  // create a heartbeat packet
+  sendHeartbeat (mavType, autopilot, component) {
+
+    // Set defaults if parameters are not provided
+    if (mavType === null || mavType === undefined) {
+      mavType = minimal.MavType.ONBOARD_CONTROLLER
+    }
+
+    if (autopilot === null || autopilot === undefined) {
+      autopilot = minimal.MavAutopilot.INVALID
+    }
+
+    if (component === null || component === undefined) {
+      component = minimal.MavComponent.ONBOARD_COMPUTER
+    }
+
+      // create a heartbeat packet
     const heartbeatMessage = new minimal.Heartbeat()
 
     heartbeatMessage.type = mavType
     heartbeatMessage.autopilot = autopilot
-    heartbeatMessage.baseMode = baseMode
-    heartbeatMessage.customMode = customMode
-    heartbeatMessage.systemStatus = systemStatus
     heartbeatMessage.mavlinkVersion = this.version
+    // Set these to zero since we aren't currently using them
+    heartbeatMessage.baseMode = 0
+    heartbeatMessage.customMode = 0
+    heartbeatMessage.systemStatus = 0
 
     this.sendData(heartbeatMessage, component)
   }
 
-  sendCommandAck (commandReceived, commandResult = 0, targetSystem = 255, targetComponent = minimal.MavComponent.MISSION_PLANNER) {
+  sendCommandAck (commandReceived, commandResult, senderSysId, senderCompId, targetComponent) {
+    // Set defaults if parameters are not provided
+    if (commandResult === null || commandResult === undefined) {
+      commandResult = 0
+    }
+
+    if (senderSysId === null || senderSysId === undefined) {
+      senderSysId = 255
+    }
+
+    if (senderCompId === null || senderCompId === undefined) {
+      senderCompId = minimal.MavComponent.MISSION_PLANNER
+    }
+
     // create a CommandAck packet
     const commandAck = new common.CommandAck()
     commandAck.command = commandReceived
@@ -278,10 +308,10 @@ class mavManager {
     commandAck.result = commandResult
     // resultParam2 is for optional additional result information. Not currently used by rpanion.
     commandAck.resultParam2 = 0
-    commandAck.targetSystem = targetSystem
+    commandAck.targetSystem = senderSysId
     commandAck.targetComponent = targetComponent
 
-    this.sendData(commandAck)
+    this.sendData(commandAck, senderCompId)
   }
 
   sendReboot () {
diff --git a/server/index.js b/server/index.js
index 17df185e..788d66b3 100644
--- a/server/index.js
+++ b/server/index.js
@@ -81,13 +81,35 @@ ntripClient.eventEmitter.on('rtcmpacket', (msg, seq) => {
   }
 })
 
-// Got a VIDEO_STREAM_INFORMATION message, send to flight controller
-// to do: get target system and component from vManager
-vManager.eventEmitter.on('videostreaminfo', (msg, senderSysId, senderCompId) => {
+// Got a camera heartbeat event, send to flight controller
+vManager.eventEmitter.on('cameraheartbeat', (mavType, autopilot, component) => {
   try {
     if (fcManager.m) {
-      fcManager.m.sendCommandAck(common.VideoStreamInformation.MSG_ID, 0, senderSysId, senderCompId)
-      fcManager.m.sendData(msg)
+      fcManager.m.sendHeartbeat(mavType, autopilot, component)
+    }
+  } catch (err) {
+    console.log(err)
+  }
+})
+
+// Got a CAMERA_INFORMATION event, send to flight controller
+vManager.eventEmitter.on('camerainfo', (msg, senderSysId, senderCompId, targetComponent) => {
+  try {
+    if (fcManager.m) {
+      fcManager.m.sendCommandAck(common.CameraInformation.MSG_ID, 0, senderSysId, senderCompId, targetComponent)
+      fcManager.m.sendData(msg, senderCompId)
+    }
+  } catch (err) {
+    console.log(err)
+  }
+})
+
+// Got a VIDEO_STREAM_INFORMATION event, send to flight controller
+vManager.eventEmitter.on('videostreaminfo', (msg, senderSysId, senderCompId, targetComponent) => {
+  try {
+    if (fcManager.m) {
+      fcManager.m.sendCommandAck(common.VideoStreamInformation.MSG_ID, 0, senderSysId, senderCompId, targetComponent)
+      fcManager.m.sendData(msg, senderCompId)
     }
   } catch (err) {
     console.log(err)
@@ -406,7 +428,7 @@ app.get('/api/softwareinfo', (req, res) => {
 
 app.get('/api/videodevices', (req, res) => {
   vManager.populateAddresses()
-  vManager.getVideoDevices((err, devices, active, seldevice, selRes, selRot, selbitrate, selfps, SeluseUDP, SeluseUDPIP, SeluseUDPPort, timestamp, fps, FPSMax, vidres, selMavURI) => {
+  vManager.getVideoDevices((err, devices, active, seldevice, selRes, selRot, selbitrate, selfps, SeluseUDP, SeluseUDPIP, SeluseUDPPort, timestamp, fps, FPSMax, vidres, useCameraHeartbeat, selMavURI) => {
     if (!err) {
       res.setHeader('Content-Type', 'application/json')
       res.send(JSON.stringify({
@@ -427,7 +449,8 @@ app.get('/api/videodevices', (req, res) => {
         error: null,
         fps: fps,
         FPSMax: FPSMax,
-        mavStreamSelected: vManager.selMavURI
+        enableCameraHeartbeat: useCameraHeartbeat,
+        mavStreamSelected: selMavURI
       }))
     } else {
       res.setHeader('Content-Type', 'application/json')
@@ -675,6 +698,7 @@ app.post('/api/startstopvideo', [check('active').isBoolean(),
   check('width').if(check('active').isIn([true])).isInt({ min: 1 }),
   check('useUDP').if(check('active').isIn([true])).isBoolean(),
   check('useTimestamp').if(check('active').isIn([true])).isBoolean(),
+  check('useCameraHeartbeat').if(check('active').isIn([true])).isBoolean(),
   check('useUDPPort').if(check('active').isIn([true])).isPort(),
   check('useUDPIP').if(check('active').isIn([true])).isIP(),
   check('bitrate').if(check('active').isIn([true])).isInt({ min: 50, max: 50000 }),
@@ -688,7 +712,7 @@ app.post('/api/startstopvideo', [check('active').isBoolean(),
     return res.status(422).json(ret)
   }
   // user wants to start/stop video streaming
-  vManager.startStopStreaming(req.body.active, req.body.device, req.body.height, req.body.width, req.body.format, req.body.rotation, req.body.bitrate, req.body.fps, req.body.useUDP, req.body.useUDPIP, req.body.useUDPPort, req.body.useTimestamp, req.body.mavStreamSelected, (err, status, addresses) => {
+  vManager.startStopStreaming(req.body.active, req.body.device, req.body.height, req.body.width, req.body.format, req.body.rotation, req.body.bitrate, req.body.fps, req.body.useUDP, req.body.useUDPIP, req.body.useUDPPort, req.body.useTimestamp, req.body.useCameraHeartbeat, req.body.mavStreamSelected, (err, status, addresses) => {
     if (!err) {
       res.setHeader('Content-Type', 'application/json')
       const ret = { streamingStatus: status, streamAddresses: addresses }
diff --git a/server/videostream.js b/server/videostream.js
index 72ff843d..076dd847 100644
--- a/server/videostream.js
+++ b/server/videostream.js
@@ -2,7 +2,7 @@ const { exec, spawn } = require('child_process')
 const os = require('os')
 const si = require('systeminformation')
 const events = require('events')
-const { common } = require('node-mavlink')
+const { minimal, common } = require('node-mavlink')
 
 class videoStream {
   constructor (settings, winston) {
@@ -18,6 +18,9 @@ class videoStream {
     // For sending events outside of object
     this.eventEmitter = new events.EventEmitter()
 
+    // Interval to send camera heartbeat events
+    this.intervalObj = null
+
     // load settings. savedDevice is a json object storing all settings
     this.active = this.settings.value('videostream.active', false)
     this.savedDevice = this.settings.value('videostream.savedDevice', null)
@@ -26,12 +29,12 @@ class videoStream {
     // need to scan for video devices first though
     if (this.active) {
       this.active = false
-      this.getVideoDevices((error, devices, active, seldevice, selRes, selRot, selbitrate, selfps, selUDP, selUDPIP, selUDPPort, useTimestamp, selMavURI) => {
+      this.getVideoDevices((error, devices, active, seldevice, selRes, selRot, selbitrate, selfps, selUDP, selUDPIP, selUDPPort, useTimestamp, useCameraHeartbeat, selMavURI) => {
         if (!error) {
           this.startStopStreaming(true, this.savedDevice.device, this.savedDevice.height,
             this.savedDevice.width, this.savedDevice.format,
             this.savedDevice.rotation, this.savedDevice.bitrate, this.savedDevice.fps, this.savedDevice.useUDP,
-            this.savedDevice.useUDPIP, this.savedDevice.useUDPPort, this.savedDevice.useTimestamp, this.savedDevice.mavStreamSelected,
+            this.savedDevice.useUDPIP, this.savedDevice.useUDPPort, this.savedDevice.useTimestamp, this.savedDevice.useCameraHeartbeat, this.savedDevice.mavStreamSelected,
             (err, status, addresses) => {
               if (err) {
                 // failed setup, reset settings
@@ -62,7 +65,7 @@ class videoStream {
   // video streaming
   getVideoDevices (callback) {
     // get all video device details
-    // callback is: err, devices, active, seldevice, selRes, selRot, selbitrate, selfps, SeluseUDP, SeluseUDPIP, SeluseUDPPort, timestamp, fps, FPSMax, vidres, selMavURI
+    // callback is: err, devices, active, seldevice, selRes, selRot, selbitrate, selfps, SeluseUDP, SeluseUDPIP, SeluseUDPPort, timestamp, fps, FPSMax, vidres, cameraHeartbeat, selMavURI
     exec('python3 ./python/gstcaps.py', (error, stdout, stderr) => {
       const warnstrings = ['DeprecationWarning', 'gst_element_message_full_with_details', 'camera_manager.cpp', 'Unsupported V4L2 pixel format']
       if (stderr && !warnstrings.some(wrn => stderr.includes(wrn))) {
@@ -81,7 +84,7 @@ class videoStream {
           return callback(null, this.devices, this.active, this.devices[0], this.devices[0].caps[0],
             { label: '0°', value: 0 }, 1100, fpsSelected, false, '127.0.0.1', 5400, false,
             (this.devices[0].caps[0].fps !== undefined) ? this.devices[0].caps[0].fps : [],
-            this.devices[0].caps[0].fpsmax, this.devices[0].caps, { label: '127.0.0.1', value: 0 })
+            this.devices[0].caps[0].fpsmax, this.devices[0].caps, false, { label: '127.0.0.1', value: 0 })
         } else {
           // format saved settings
           const seldevice = this.devices.filter(it => it.value === this.savedDevice.device)
@@ -93,7 +96,7 @@ class videoStream {
             return callback(null, this.devices, this.active, this.devices[0], this.devices[0].caps[0],
               { label: '0°', value: 0 }, 1100, fpsSelected, false, '127.0.0.1', 5400, false,
               (this.devices[0].caps[0].fps !== undefined) ? this.devices[0].caps[0].fps : [],
-              this.devices[0].caps[0].fpsmax, this.devices[0].caps, { label: '127.0.0.1', value: 0 })
+              this.devices[0].caps[0].fpsmax, this.devices[0].caps, false, { label: '127.0.0.1', value: 0 })
           }
           const selRes = seldevice[0].caps.filter(it => it.value === this.savedDevice.width.toString() + 'x' + this.savedDevice.height.toString() + 'x' + this.savedDevice.format.toString().split('/')[1])
           let selFPS = this.savedDevice.fps
@@ -107,7 +110,7 @@ class videoStream {
               { label: this.savedDevice.rotation.toString() + '°', value: this.savedDevice.rotation },
               this.savedDevice.bitrate, selFPS, this.savedDevice.useUDP, this.savedDevice.useUDPIP,
               this.savedDevice.useUDPPort, this.savedDevice.useTimestamp, (selRes[0].fps !== undefined) ? selRes[0].fps : [],
-              selRes[0].fpsmax, seldevice[0].caps, this.savedDevice.mavStreamSelected)
+              selRes[0].fpsmax, seldevice[0].caps, this.savedDevice.useCameraHeartbeat, { label: this.savedDevice.mavStreamSelected.toString(), value: this.savedDevice.mavStreamSelected })
           } else {
             // bad settings
             console.error('Bad video settings. Resetting' + seldevice + ', ' + selRes)
@@ -116,7 +119,7 @@ class videoStream {
             return callback(null, this.devices, this.active, this.devices[0], this.devices[0].caps[0],
               { label: '0°', value: 0 }, 1100, fpsSelected, false, '127.0.0.1', 5400, false,
               (this.devices[0].caps[0].fps !== undefined) ? this.devices[0].caps[0].fps : [],
-              this.devices[0].caps[0].fpsmax, this.devices[0].caps, { label: '127.0.0.1', value: 0 })
+              this.devices[0].caps[0].fpsmax, this.devices[0].caps, false, { label: '127.0.0.1', value: 0 })
           }
         }
       }
@@ -161,7 +164,7 @@ class videoStream {
     return iface
   }
 
-  async startStopStreaming (active, device, height, width, format, rotation, bitrate, fps, useUDP, useUDPIP, useUDPPort, useTimestamp, mavStreamSelected, callback) {
+  async startStopStreaming (active, device, height, width, format, rotation, bitrate, fps, useUDP, useUDPIP, useUDPPort, useTimestamp, useCameraHeartbeat, mavStreamSelected, callback) {
     // if current state same, don't do anything
     if (this.active === active) {
       console.log('Video current same')
@@ -201,6 +204,7 @@ class videoStream {
         useUDPIP,
         useUDPPort,
         useTimestamp,
+        useCameraHeartbeat,
         mavStreamSelected
       }
 
@@ -262,12 +266,21 @@ class videoStream {
         this.resetVideo()
       })
 
+      if (this.savedDevice.useCameraHeartbeat) {
+        this.startInterval()
+      }
+
       console.log('Started Video Streaming of ' + device)
       this.winston.info('Started Video Streaming of ' + device)
 
       return callback(null, this.active, this.deviceAddresses)
     } else {
       // stop streaming
+      // if mavlink advertising is on, clear the interval
+
+      if (this.savedDevice.useCameraHeartbeat) {
+        clearInterval(this.intervalObj)
+      }
       this.deviceStream.stdin.pause()
       this.deviceStream.kill()
       this.resetVideo()
@@ -289,18 +302,64 @@ class videoStream {
     return ret
   }
 
+  startInterval () {
+    // start the 1-sec loop to send heartbeat events
+    this.intervalObj = setInterval(() => {
+      const mavType = minimal.MavType.CAMERA
+      const autopilot = minimal.MavAutopilot.INVALID
+      const component = minimal.MavComponent.CAMERA
+
+      this.eventEmitter.emit('cameraheartbeat', mavType, autopilot, component)
+    }, 1000)
+  }
+
   onMavPacket (packet, data) {
     // FC is active
     if (!this.active) {
       return
     }
 
-    if (packet.header.msgid === common.CommandLong.MSG_ID & data._param1 === common.VideoStreamInformation.MSG_ID) {
+    if (data.targetComponent === minimal.MavComponent.CAMERA &&
+      packet.header.msgid === common.CommandLong.MSG_ID &&
+      data._param1 === common.CameraInformation.MSG_ID) {
+      console.log('Responding to MAVLink request for CameraInformation')
+      this.winston.info('Responding to MAVLink request for CameraInformation')
+
+      const senderSysId = packet.header.sysid
+      const senderCompId = minimal.MavComponent.CAMERA
+      const targetComponent = packet.header.compid
+
+      // build a CAMERA_INFORMATION packet
+      const msg = new common.CameraInformation()
+
+      // TODO: implement missing attributes here
+      msg.timeBootMs = 0
+      msg.vendorName = 0
+      msg.modelName = 0
+      msg.firmwareVersion = 0
+      msg.focalLength = null
+      msg.sensorSizeH = null
+      msg.sensorSizeV = null
+      msg.resolutionH = this.savedDevice.width
+      msg.resolutionV = this.savedDevice.height
+      msg.lensId = 0
+      // 256 = CAMERA_CAP_FLAGS_HAS_VIDEO_STREAM (hard-coded for now until Rpanion gains more camera capabilities)
+      msg.flags = 256
+      msg.camDefinitionVersion = 0
+      msg.camDefinitionUri = ''
+      msg.gimbalDeviceId = 0
+      this.eventEmitter.emit('camerainfo', msg, senderSysId, senderCompId, targetComponent)
+
+    } else if (data.targetComponent === minimal.MavComponent.CAMERA &&
+      packet.header.msgid === common.CommandLong.MSG_ID &&
+      data._param1 === common.VideoStreamInformation.MSG_ID) {
+
       console.log('Responding to MAVLink request for VideoStreamInformation')
       this.winston.info('Responding to MAVLink request for VideoStreamInformation')
 
       const senderSysId = packet.header.sysid
-      const senderCompId = packet.header.compid
+      const senderCompId = minimal.MavComponent.CAMERA
+      const targetComponent = packet.header.compid
 
       // build a VIDEO_STREAM_INFORMATION packet
       const msg = new common.VideoStreamInformation()
@@ -309,12 +368,16 @@ class videoStream {
       msg.streamId = 1
       msg.count = 1
 
-      // 0 = VIDEO_STREAM_TYPE_RTSP
-      // 1 = VIDEO_STREAM_TYPE_RTPUDP
-      if (this.savedDevice.useUDP === 'rtp') {
+      // msg.type and msg.uri need to be different depending on whether RTP or RTSP is selected
+      if (this.savedDevice.useUDP) {
+        // msg.type = 0 = VIDEO_STREAM_TYPE_RTSP
+        // msg.type = 1 = VIDEO_STREAM_TYPE_RTPUDP
         msg.type = 1
+        // For RTP, just send the destination UDP port instead of a full URI
+        msg.uri = this.savedDevice.useUDPPort.toString()
       } else {
         msg.type = 0
+        msg.uri = `rtsp://${this.savedDevice.mavStreamSelected}:8554/${this.savedDevice.device}`
       }
 
       // 1 = VIDEO_STREAM_STATUS_FLAGS_RUNNING
@@ -328,11 +391,8 @@ class videoStream {
       // Rpanion doesn't collect field of view values, so just set to zero
       msg.hfov = 0
       msg.name = this.savedDevice.device
-      // To do: add a UI option to select which interface's URI to send
-      msg.uri = this.deviceAddresses[this.savedDevice.mavStreamSelected]
 
-      // console.log("mavStreamSelected: " + this.savedDevice.mavStreamSelected)
-      this.eventEmitter.emit('videostreaminfo', msg, senderSysId, senderCompId)
+      this.eventEmitter.emit('videostreaminfo', msg, senderSysId, senderCompId, targetComponent)
     }
   }
 }
diff --git a/server/videostream.test.js b/server/videostream.test.js
index bd9979ef..a5776838 100644
--- a/server/videostream.test.js
+++ b/server/videostream.test.js
@@ -63,11 +63,11 @@ describe('Video Functions', function () {
     settings.clear()
     const vManager = new VideoStream(settings, winston)
 
-    vManager.startStopStreaming(true, 'testsrc', '1080', '1920', 'video/x-h264', '0', '1000', '5', false, false, false, true, '0', function (err, status, addresses) {
+    vManager.startStopStreaming(true, 'testsrc', '1080', '1920', 'video/x-h264', '0', '1000', '5', false, false, false, true, false, '0', function (err, status, addresses) {
       assert.equal(err, null)
       assert.equal(status, true)
       assert.notEqual(vManager.deviceStream.pid, null)
-      vManager.startStopStreaming(false, 'testsrc', '1080', '1920', 'video/x-h264', '0', '1000', '5', false, false, false, true, '0', function (err, status, addresses) {
+      vManager.startStopStreaming(false, 'testsrc', '1080', '1920', 'video/x-h264', '0', '1000', '5', false, false, false, true, false, '0', function (err, status, addresses) {
         assert.equal(err, null)
         assert.equal(status, false)
         done()
diff --git a/src/video.js b/src/video.js
index d7f12aee..2148a1ae 100644
--- a/src/video.js
+++ b/src/video.js
@@ -32,7 +32,8 @@ class VideoPage extends basePage {
       error: null,
       infoMessage: null,
       timestamp: false,
-      mavStreamSelected: { label: "127.0.0.1", value: 0 }
+      enableCameraHeartbeat: false,
+      mavStreamSelected: this.props.mavStreamSelected
     }
   }
 
@@ -96,6 +97,11 @@ class VideoPage extends basePage {
     this.setState({ timestamp: !this.state.timestamp });
   }
 
+  handleUseCameraHeartbeatChange = (event) => {
+    // Toggle camera heartbeat events
+    this.setState({ enableCameraHeartbeat: !this.state.enableCameraHeartbeat });
+  }
+
   handleMavStreamChange = (value) => {
     //new value for selected stream IP
     this.setState({ mavStreamSelected: value });
@@ -124,6 +130,7 @@ class VideoPage extends basePage {
           useUDPIP: this.state.useUDPIP,
           useUDPPort: this.state.useUDPPort,
           useTimestamp: this.state.timestamp,
+          useCameraHeartbeat: this.state.enableCameraHeartbeat,
           mavStreamSelected: this.state.mavStreamSelected.value,
         })
       }).then(response => response.json()).then(state => { this.setState(state); this.setState({ waiting: false }) });
@@ -194,15 +201,6 @@ class VideoPage extends basePage {
             <input disabled={this.state.streamingStatus} type="number" name="fps" min="1" max={this.state.FPSMax} step="1" onChange={this.handleFPSChange} value={this.state.fpsSelected} />fps (max: {this.state.FPSMax})
           </div>
         </div>
-        <br />
-    <h3>MAVLink Video Streaming Service</h3>
-    <p><i>Configuration for advertising the video stream via MAVLink. See <a href='https://mavlink.io/en/services/camera.html#video_streaming'>here</a> for details.</i></p>
-    <div className="form-group row" style={{ marginBottom: '5px' }}>
-      <label className="col-sm-4 col-form-label">Video source IP Address</label>
-      <div className="col-sm-8">
-        <Select isDisabled={this.state.streamingStatus} onChange={this.handleMavStreamChange} options={this.state.ifaces.map((item, index) => ({ value: index, label: item}))} value={this.state.mavStreamSelected} />
-      </div>
-    </div>
         <div style={{ display: (this.state.UDPChecked) ? "block" : "none" }}>
           <div className="form-group row" style={{ marginBottom: '5px' }}>
             <label className="col-sm-4 col-form-label ">Destination IP</label>
@@ -217,11 +215,30 @@ class VideoPage extends basePage {
             </div>
           </div>
         </div>
+        <br/>
+        <h3>MAVLink Video Streaming Service</h3>
+        <p><i>Configuration for advertising the camera and associated video stream via MAVLink. See <a href='https://mavlink.io/en/services/camera.html#video_streaming'>here</a> for details.</i></p>
+        <div className="form-group row" style={{ marginBottom: '5px' }}>
+          <label className="col-sm-4 col-form-label">Enable camera heartbeats</label>
+          <div className="col-sm-7">
+          <input type="checkbox" disabled={this.state.streamingStatus} checked={this.state.enableCameraHeartbeat} onChange={this.handleUseCameraHeartbeatChange} />
+          </div>
+        </div>
+        <div style={{ display: (this.state.enableCameraHeartbeat && (!this.state.UDPChecked)) ? "block" : "none" }}>
+          <div className="form-group row" style={{ marginBottom: '5px' } }>
+              <label className="col-sm-4 col-form-label">Video source IP Address</label>
+              <div className="col-sm-8">
+                <Select isDisabled={this.state.streamingStatus} onChange={this.handleMavStreamChange} options={this.state.ifaces.map((item) => ({ value: item, label: item}))} value={this.state.mavStreamSelected} />
+              </div>
+          </div>
+        </div>
+        <br/>
 
         <div className="form-group row" style={{ marginBottom: '5px' }}>
           <div className="col-sm-8">
             <Button onClick={this.handleStreaming} className="btn btn-primary">{this.state.streamingStatus ? "Stop Streaming" : "Start Streaming"}</Button>
           </div>
+          <br/>
         </div>
 
         <br />