diff --git a/docker-compose.yml b/docker-compose.yml
index 84f93985..095e102f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -83,3 +83,17 @@ nginx:
   labels:
     - triton.cns.services=nginx
     - com.docker.swarm.affinities=["container!=~*nginx*"]
+#############################################################################
+#  Prometheus is an open source performance monitoring tool
+#  it is included here for demo purposes and is not required
+#############################################################################
+prometheus:
+  image: autopilotpattern/prometheus:latest
+  restart: always
+  mem_limit: 1g
+  env_file: .env
+  ports:
+    - 9090
+  labels:
+    - triton.cns.services=prometheus
+    - com.docker.swarm.affinities=["container!=~*prometheus*"]
diff --git a/frontend/src/components/people-list/table/person-role.js b/frontend/src/components/people-list/table/person-role.js
index 9fb2c543..da48ed25 100644
--- a/frontend/src/components/people-list/table/person-role.js
+++ b/frontend/src/components/people-list/table/person-role.js
@@ -60,9 +60,12 @@ const PersonRole = (props) => {
   const toggled = toggledID;
   const handleClick = () => handleRoleTooltip(person.uuid);
   const handleOptionSelect = (updatedMember) => handleRoleUpdate(updatedMember);
-  const _person = {
-    ...person,
-    personIndex
+
+  // Only send relevent info as props
+  const _person =  {
+    uuid: person.uuid,
+    status: person.status,
+    role: person.role
   };
 
   return (
@@ -76,6 +79,7 @@ const PersonRole = (props) => {
           handleSelect={handleOptionSelect}
           options={membersRolesOptions}
           person={_person}
+          personIndex={personIndex}
           />
         : null }
     </StyledWrapper>
diff --git a/frontend/src/components/people-list/table/tooltip.js b/frontend/src/components/people-list/table/tooltip.js
index 69a5681b..80cc6294 100644
--- a/frontend/src/components/people-list/table/tooltip.js
+++ b/frontend/src/components/people-list/table/tooltip.js
@@ -16,15 +16,22 @@ const arrowPosition = {
 module.exports = ({
   handleSelect,
   person = {},
+  personIndex,
   options = [],
 }) => {
 
   const _options = options.map( (option, i) => {
 
-    const _onClick = () => handleSelect({
-      ...person,
-      role: option
-    });
+    const payload = {
+      person: {
+        uuid: person.uuid,
+        status: person.status,
+        role: option
+      },
+      personIndex
+    };
+
+    const _onClick = () => handleSelect(payload);
 
     return (
       <li
@@ -53,4 +60,5 @@ module.exports.propTypes = {
   handleSelect: React.PropTypes.func,
   options: React.PropTypes.array,
   person: React.PropTypes.object,
+  personIndex: React.PropTypes.number,
 };
\ No newline at end of file
diff --git a/frontend/src/state/reducers/orgs.js b/frontend/src/state/reducers/orgs.js
index e7ce272b..896ff027 100644
--- a/frontend/src/state/reducers/orgs.js
+++ b/frontend/src/state/reducers/orgs.js
@@ -51,6 +51,7 @@ module.exports = handleActions({
     // TODO:
     // Change "1" to org index. At the moment only updates
     // "biz-tech"
+
     return {
       ...state,
       ui: {
@@ -64,7 +65,7 @@ module.exports = handleActions({
           members: [
             ...state.data[1].members.slice(0, action.payload.personIndex),
             {
-              ...action.payload
+              ...action.payload.person
             },
             ...state.data[1].members.slice(action.payload.personIndex + 1)
           ]