diff --git a/UI/src/components/role/index.js b/UI/src/components/role/index.js
index adbbb27..c724750 100644
--- a/UI/src/components/role/index.js
+++ b/UI/src/components/role/index.js
@@ -1,11 +1,17 @@
 import React, { Component } from 'react'
-import Radium from 'radium'
+import PropTypes from 'prop-types'
 import Color from 'color'
 import './Role.sass'
 
 const whiteColor = Color('#efefef')
 
 class Role extends Component {
+  static propTypes = {
+    role: PropTypes.object.isRequired,
+    onToggle: PropTypes.func,
+    type: PropTypes.string
+  }
+
   render () {
     const { role } = this.props
     let color = Color(role.color)
@@ -34,4 +40,4 @@ class Role extends Component {
   }
 }
 
-export default Radium(Role)
+export default Role
diff --git a/UI/src/components/servers/Navigation.js b/UI/src/components/servers/Navigation.js
index ddb881e..ec66743 100644
--- a/UI/src/components/servers/Navigation.js
+++ b/UI/src/components/servers/Navigation.js
@@ -1,4 +1,5 @@
 import React, { Component, Fragment } from 'react'
+import ImmutablePropTypes from 'react-immutable-proptypes'
 import PropTypes from 'prop-types'
 import ServerCard from './ServerCard'
 import UserCard from './UserCard'
@@ -6,8 +7,8 @@ import UserCard from './UserCard'
 class ServersNavigation extends Component {
 
   static propTypes = {
-    user: PropTypes.object.isRequired,
-    servers: PropTypes.arrayOf(PropTypes.object).isRequired,
+    user: ImmutablePropTypes.map.isRequired,
+    servers: ImmutablePropTypes.setOf(ImmutablePropTypes.map).isRequired,
     className: PropTypes.string
   }
 
diff --git a/UI/src/components/servers/ServerCard.js b/UI/src/components/servers/ServerCard.js
index b561201..d3f0922 100644
--- a/UI/src/components/servers/ServerCard.js
+++ b/UI/src/components/servers/ServerCard.js
@@ -1,9 +1,15 @@
 import React, { Component } from 'react'
+import ImmutablePropTypes from 'react-immutable-proptypes'
 import { NavLink } from 'react-router-dom'
 import Radium from 'radium'
 import './ServerCard.sass'
 
 class ServerCard extends Component {
+  static propTypes = {
+    user: ImmutablePropTypes.map.isRequired,
+    server: ImmutablePropTypes.map.isRequired,
+  }
+
   render () {
     const { server, user } = this.props
 
diff --git a/UI/src/components/servers/UserCard.js b/UI/src/components/servers/UserCard.js
index ceab11d..f633439 100644
--- a/UI/src/components/servers/UserCard.js
+++ b/UI/src/components/servers/UserCard.js
@@ -1,11 +1,11 @@
 import React, { Component } from 'react'
-import PropTypes from 'prop-types'
+import ImmutablePropTypes from 'react-immutable-proptypes'
 import { NavLink } from 'react-router-dom'
 import './UserCard.sass'
 
 class UserCard extends Component {
   static propTypes = {
-    user: PropTypes.object.isRequired
+    user: ImmutablePropTypes.map
   }
 
   get avatar () {