diff --git a/jams-react-client/src/components/CaSetup/CaSetup.js b/jams-react-client/src/components/CaSetup/CaSetup.js
index 37ec76072efb032671ae403612150f39b2012a65..8a13a009aef10da96a6d9bfa0906d7522b9a352c 100644
--- a/jams-react-client/src/components/CaSetup/CaSetup.js
+++ b/jams-react-client/src/components/CaSetup/CaSetup.js
@@ -1,4 +1,4 @@
-import React from "react";
+import React, { useState } from "react";
 import { useHistory } from "react-router-dom";
 import { Formik, Field } from "formik";
 import * as Yup from "yup";
@@ -118,12 +118,10 @@ export default function CaSetup(props) {
   const validityPeriodsItems = tool.buildSelectMenuItems(validityPeriods);
   const classes = useStyles();
 
-  const [certificateOpt, setCertificateOpt] = React.useState(
+  const [certificateOpt, setCertificateOpt] = useState(
     getCertificateOptions[0]
   );
-  const [validityPeriod, setValidityPeriod] = React.useState(
-    validityPeriods[0]
-  );
+  const [validityPeriod, setValidityPeriod] = useState(validityPeriods[0]);
 
   function handleInstallCA(data) {
     if (data.status === 500 || data.status === 512 || data.status === 513) {
diff --git a/jams-react-client/src/components/Devices/Devices.js b/jams-react-client/src/components/Devices/Devices.js
index 06793004d3aeb2a343699527b50dc848813577b5..3a2d3ed787d806e201f43fb76a28dee702d596b3 100755
--- a/jams-react-client/src/components/Devices/Devices.js
+++ b/jams-react-client/src/components/Devices/Devices.js
@@ -1,4 +1,4 @@
-import React, { useEffect } from "react";
+import React, { useEffect, useState } from "react";
 import { useHistory } from "react-router-dom";
 
 import classnames from "classnames";
@@ -44,11 +44,11 @@ export default function Devices(props) {
   const classes = useStyles();
   const history = useHistory();
 
-  const [devices, setDevices] = React.useState([]);
-  const [selectedDevice, setSelectedDevice] = React.useState({});
-  const [displayName, setDisplayName] = React.useState("");
-  const [openEdit, setOpenEdit] = React.useState(false);
-  const [openRevoke, setOpenRevoke] = React.useState(false);
+  const [devices, setDevices] = useState([]);
+  const [selectedDevice, setSelectedDevice] = useState({});
+  const [displayName, setDisplayName] = useState("");
+  const [openEdit, setOpenEdit] = useState(false);
+  const [openRevoke, setOpenRevoke] = useState(false);
   const userData = {
     username: props.username,
   };
diff --git a/jams-react-client/src/components/IdentityManagement/IdentityManagement.js b/jams-react-client/src/components/IdentityManagement/IdentityManagement.js
index 48d54d253d97cd6b96a5926d748ad48dea54029d..4b4386a594df5837aa2fe11b4d130e0d3becbbdb 100644
--- a/jams-react-client/src/components/IdentityManagement/IdentityManagement.js
+++ b/jams-react-client/src/components/IdentityManagement/IdentityManagement.js
@@ -1,4 +1,4 @@
-import React from "react";
+import React, { useState } from "react";
 import { useHistory } from "react-router-dom";
 import { Formik } from "formik";
 import Button from "@material-ui/core/Button";
@@ -109,13 +109,13 @@ export default function IdentityManagement(props) {
 
   const classes = useStyles();
   const history = useHistory();
-  const [directory, setDirectory] = React.useState(directoryTypes[0]);
+  const [directory, setDirectory] = useState(directoryTypes[0]);
 
   /**
    * Local storage Config
    */
 
-  const [nameServerChecked, setNameServerChecked] = React.useState(false);
+  const [nameServerChecked, setNameServerChecked] = useState(false);
 
   /**
    * LDAP storage Config
@@ -124,8 +124,8 @@ export default function IdentityManagement(props) {
   const ldapFiltersTypes = [{ value: 0, label: "UID" }];
 
   const ldapFiltersTypesItems = buildSelectMenuItems(ldapFiltersTypes);
-  const [useStartTLS, setUseStartTLS] = React.useState("false");
-  const [ldapFilter, setLdapFilter] = React.useState(ldapFiltersTypes[0]);
+  const [useStartTLS, setUseStartTLS] = useState("false");
+  const [ldapFilter, setLdapFilter] = useState(ldapFiltersTypes[0]);
 
   const handleFilterIdChange = (event) => {
     setLdapFilter(ldapFiltersTypes[event.target.value]);
@@ -142,7 +142,7 @@ export default function IdentityManagement(props) {
    * Active Directory Storage Config
    */
 
-  const [isSSL, setIsSSL] = React.useState("false");
+  const [isSSL, setIsSSL] = useState("false");
 
   const handleIsSSLChange = (event) => {
     setIsSSL(event.target.value);
diff --git a/jams-react-client/src/components/LanguagePicker/LanguagePicker.js b/jams-react-client/src/components/LanguagePicker/LanguagePicker.js
index 366d6a2ef8c2b84fdd98bb50c8c5fdeb2ee11d76..826b6fdabb1aa5d61d1563f6f51a919f6965ce01 100644
--- a/jams-react-client/src/components/LanguagePicker/LanguagePicker.js
+++ b/jams-react-client/src/components/LanguagePicker/LanguagePicker.js
@@ -1,4 +1,4 @@
-import React, { useEffect } from "react";
+import React, { useEffect, useState } from "react";
 import { useHistory } from "react-router-dom";
 
 import Button from "@material-ui/core/Button";
@@ -12,10 +12,10 @@ import { useTranslation } from "react-i18next";
 
 export default function LanguagePicker(props) {
   const history = useHistory();
-  const [language, setLanguage] = React.useState(
+  const [language, setLanguage] = useState(
     i18next.language || window.localStorage.i18nextLng || "en"
   );
-  const [languages, setLanguages] = React.useState([]);
+  const [languages, setLanguages] = useState([]);
 
   const { i18n } = useTranslation();
 
diff --git a/jams-react-client/src/components/PasswordDialog/PasswordDialog.js b/jams-react-client/src/components/PasswordDialog/PasswordDialog.js
index f3053003cde7e32af1357eab593fd4f90887781c..e01debc93fc7ece3c1a940b3bb8dae2e031b9a76 100644
--- a/jams-react-client/src/components/PasswordDialog/PasswordDialog.js
+++ b/jams-react-client/src/components/PasswordDialog/PasswordDialog.js
@@ -1,4 +1,4 @@
-import React from "react";
+import React, { useState } from "react";
 // @material-ui/core components
 import { makeStyles } from "@material-ui/core/styles";
 // core components
@@ -54,9 +54,9 @@ const useStyles = makeStyles(styles);
 export default function PasswordDialog(props) {
   const classes = useStyles();
 
-  const [copied, setCopied] = React.useState(false);
-  const [generated, setGenerated] = React.useState(false);
-  const [passwordVisible, setPasswordVisible] = React.useState(false);
+  const [copied, setCopied] = useState(false);
+  const [generated, setGenerated] = useState(false);
+  const [passwordVisible, setPasswordVisible] = useState(false);
 
   const passwordGenerator = () => {
     return generator.generate({
diff --git a/jams-react-client/src/components/ServerParameters/ServerParameters.js b/jams-react-client/src/components/ServerParameters/ServerParameters.js
index 4fe0c7afab2dc6b26ea2a0acb93312b5929ad31d..1404916c0adaea4fedf7b538d31caeafdcb985bc 100644
--- a/jams-react-client/src/components/ServerParameters/ServerParameters.js
+++ b/jams-react-client/src/components/ServerParameters/ServerParameters.js
@@ -1,4 +1,4 @@
-import React from "react";
+import React, { useState } from "react";
 import { useHistory } from "react-router-dom";
 import Button from "@material-ui/core/Button";
 import TextField from "@material-ui/core/TextField";
@@ -83,19 +83,15 @@ export default function ServerParameters(props) {
 
   const classes = useStyles();
   const history = useHistory();
-  const [certificateRevocation, setCertificateRevocation] = React.useState(
+  const [certificateRevocation, setCertificateRevocation] = useState(
     certificateRevocationTypes[0]
   );
-  const [deviceLifetime, setDeviceLifetime] = React.useState(
-    deviceLifetimeTypes[3]
-  );
-  const [userAccountLifetime, setUserAccountLifetime] = React.useState(
+  const [deviceLifetime, setDeviceLifetime] = useState(deviceLifetimeTypes[3]);
+  const [userAccountLifetime, setUserAccountLifetime] = useState(
     userAccountLifetimeTypes[0]
   );
-  const [sipConfigurationTemplate, setSIPCertificateTemplate] = React.useState(
-    null
-  );
-  const [userlifeDisabled, setUserlifeDisabled] = React.useState(false);
+  const [sipConfigurationTemplate, setSIPCertificateTemplate] = useState(null);
+  const [userlifeDisabled, setUserlifeDisabled] = useState(false);
 
   React.useEffect(() => {
     if (deviceLifetime.value <= userAccountLifetime.value) {
diff --git a/jams-react-client/src/components/Sidebar/Sidebar.js b/jams-react-client/src/components/Sidebar/Sidebar.js
index 00a4905434223226f46e4a6435ee91c778143c56..f88c29ae96443e80f58ca206eb94eb0cdc52c7cb 100755
--- a/jams-react-client/src/components/Sidebar/Sidebar.js
+++ b/jams-react-client/src/components/Sidebar/Sidebar.js
@@ -1,5 +1,5 @@
 /*eslint-disable*/
-import React from "react";
+import React, { useState } from "react";
 import { Link, useHistory } from "react-router-dom";
 import classNames from "classnames";
 import PropTypes from "prop-types";
@@ -29,7 +29,7 @@ const useStyles = makeStyles(styles);
 export default function Sidebar(props) {
   const classes = useStyles();
   const mainPanel = React.createRef();
-  const [open, setOpen] = React.useState(false);
+  const [open, setOpen] = useState(false);
   const history = useHistory();
 
   const handleCloseProfile = () => {
diff --git a/jams-react-client/src/layouts/BaseLayout.js b/jams-react-client/src/layouts/BaseLayout.js
index 115f551848f8befb61b652544af7129de405766e..1546ace3d789ec1573157db8e8205b7bdabd8530 100644
--- a/jams-react-client/src/layouts/BaseLayout.js
+++ b/jams-react-client/src/layouts/BaseLayout.js
@@ -1,4 +1,4 @@
-import React from "react";
+import React, { useState } from "react";
 import { Switch, Route, Redirect } from "react-router-dom";
 // creates a beautiful scrollbar
 import PerfectScrollbar from "perfect-scrollbar";
@@ -52,19 +52,19 @@ export default function Admin(props) {
   // ref to help us initialize PerfectScrollbar on windows devices
   const mainPanel = React.createRef();
   // states and functions
-  const [image, setImage] = React.useState(bgImage);
-  const [color, setColor] = React.useState("blue");
-  const [fixedClasses, setFixedClasses] = React.useState("dropdown");
-  const [mobileOpen, setMobileOpen] = React.useState(false);
-  const [open, setOpen] = React.useState(false);
-  const [message, setMessage] = React.useState(false);
-  const [openUpdate, setOpenUpdate] = React.useState(false);
-  const [dialogMessage, setDialogMessage] = React.useState("");
-  const [messageYes, setMessageYes] = React.useState("");
-  const [messageNo, setMessageNo] = React.useState("");
-  const [updating, setUpdating] = React.useState(false);
-  const [query, setQuery] = React.useState(false);
-  const [snackbarMessage, setSnackbarMessage] = React.useState("");
+  const [image, setImage] = useState(bgImage);
+  const [color, setColor] = useState("blue");
+  const [fixedClasses, setFixedClasses] = useState("dropdown");
+  const [mobileOpen, setMobileOpen] = useState(false);
+  const [open, setOpen] = useState(false);
+  const [message, setMessage] = useState(false);
+  const [openUpdate, setOpenUpdate] = useState(false);
+  const [dialogMessage, setDialogMessage] = useState("");
+  const [messageYes, setMessageYes] = useState("");
+  const [messageNo, setMessageNo] = useState("");
+  const [updating, setUpdating] = useState(false);
+  const [query, setQuery] = useState(false);
+  const [snackbarMessage, setSnackbarMessage] = useState("");
 
   const Routes = [
     {
diff --git a/jams-react-client/src/layouts/ListLayout.js b/jams-react-client/src/layouts/ListLayout.js
index 34f68700805300570ce5170d66a3ca2a6f5498b8..25be89d5e372d3bb793392476133e483bbf98867 100644
--- a/jams-react-client/src/layouts/ListLayout.js
+++ b/jams-react-client/src/layouts/ListLayout.js
@@ -1,4 +1,4 @@
-import React from "react";
+import React, { useState } from "react";
 import { Switch, Route, Redirect } from "react-router-dom";
 // creates a beautiful scrollbar
 import PerfectScrollbar from "perfect-scrollbar";
@@ -53,19 +53,19 @@ export default function Admin(props) {
   // ref to help us initialize PerfectScrollbar on windows devices
   const mainPanel = React.createRef();
   // states and functions
-  const [image, setImage] = React.useState(bgImage);
-  const [color, setColor] = React.useState("blue");
-  const [fixedClasses, setFixedClasses] = React.useState("dropdown");
-  const [mobileOpen, setMobileOpen] = React.useState(false);
-  const [open, setOpen] = React.useState(false);
-  const [message, setMessage] = React.useState(false);
-  const [openUpdate, setOpenUpdate] = React.useState(false);
-  const [dialogMessage, setDialogMessage] = React.useState("");
-  const [messageYes, setMessageYes] = React.useState("");
-  const [messageNo, setMessageNo] = React.useState("");
-  const [updating, setUpdating] = React.useState(false);
-  const [query, setQuery] = React.useState(false);
-  const [snackbarMessage, setSnackbarMessage] = React.useState("");
+  const [image, setImage] = useState(bgImage);
+  const [color, setColor] = useState("blue");
+  const [fixedClasses, setFixedClasses] = useState("dropdown");
+  const [mobileOpen, setMobileOpen] = useState(false);
+  const [open, setOpen] = useState(false);
+  const [message, setMessage] = useState(false);
+  const [openUpdate, setOpenUpdate] = useState(false);
+  const [dialogMessage, setDialogMessage] = useState("");
+  const [messageYes, setMessageYes] = useState("");
+  const [messageNo, setMessageNo] = useState("");
+  const [updating, setUpdating] = useState(false);
+  const [query, setQuery] = useState(false);
+  const [snackbarMessage, setSnackbarMessage] = useState("");
 
   const Routes = [
     {
diff --git a/jams-react-client/src/layouts/SignIn.js b/jams-react-client/src/layouts/SignIn.js
index 24dcf233bcd494fae9cd76c1cd58bbcf1a40c1e6..6b50df9f735ddf80c5d46b95b1dcf10e329ab614 100644
--- a/jams-react-client/src/layouts/SignIn.js
+++ b/jams-react-client/src/layouts/SignIn.js
@@ -1,4 +1,4 @@
-import React from "react";
+import React, { useState } from "react";
 import { useHistory } from "react-router-dom";
 import { Formik } from "formik";
 import Button from "@material-ui/core/Button";
@@ -69,8 +69,8 @@ export default function SignIn(props) {
 
   const classes = useStyles();
   const history = useHistory();
-  const [error, setError] = React.useState(false);
-  const [errorMessage, setErrorMessage] = React.useState("");
+  const [error, setError] = useState(false);
+  const [errorMessage, setErrorMessage] = useState("");
 
   React.useEffect(() => {
     if (auth.isAuthenticated() && auth.isInstalled()) {
diff --git a/jams-react-client/src/layouts/SignUp.js b/jams-react-client/src/layouts/SignUp.js
index 81eb41a3cf7e1ea927800f9c183020381560e354..84775d6f99bad1090585a71e39a7f97599e1ebc3 100644
--- a/jams-react-client/src/layouts/SignUp.js
+++ b/jams-react-client/src/layouts/SignUp.js
@@ -1,4 +1,4 @@
-import React, { useEffect } from "react";
+import React, { useEffect, useState } from "react";
 import CssBaseline from "@material-ui/core/CssBaseline";
 import Link from "@material-ui/core/Link";
 import Box from "@material-ui/core/Box";
@@ -66,8 +66,8 @@ const useStyles = makeStyles((theme) => ({
 
 export default function SignUp(props) {
   const classes = useStyles();
-  const [error, setError] = React.useState(false);
-  const [errorMessage, setErrorMessage] = React.useState("Test");
+  const [error, setError] = useState(false);
+  const [errorMessage, setErrorMessage] = useState("Test");
 
   useEffect(() => {
     //request the server to check for the step to return
diff --git a/jams-react-client/src/views/Blueprint/Blueprint.js b/jams-react-client/src/views/Blueprint/Blueprint.js
index da32490fa4251157d75878dd2acdaf88c443e3d2..5c81a9e5194a1b59853a08729203a4f9ed9ba363 100644
--- a/jams-react-client/src/views/Blueprint/Blueprint.js
+++ b/jams-react-client/src/views/Blueprint/Blueprint.js
@@ -1,4 +1,4 @@
-import React from "react";
+import React, { useState } from "react";
 
 import PropTypes from "prop-types";
 import AppBar from "@material-ui/core/AppBar";
@@ -48,7 +48,7 @@ function a11yProps(index) {
 }
 
 export default function Blueprint(props) {
-  const [value, setValue] = React.useState(0);
+  const [value, setValue] = useState(0);
 
   const handleChange = (event, newValue) => {
     setValue(newValue);
diff --git a/jams-react-client/src/views/Blueprint/EditBlueprintConfiguration.js b/jams-react-client/src/views/Blueprint/EditBlueprintConfiguration.js
index 0820df8b904ff40135cf4a3916861a520d64f263..7718b7447c27abf7475e0495cd84b576104f768a 100644
--- a/jams-react-client/src/views/Blueprint/EditBlueprintConfiguration.js
+++ b/jams-react-client/src/views/Blueprint/EditBlueprintConfiguration.js
@@ -1,4 +1,4 @@
-import React from "react";
+import React, { useState } from "react";
 import clsx from "clsx";
 
 // @material-ui/core components
@@ -170,32 +170,30 @@ const StyledRadio = (props) => {
 export default function EditBlueprintConfiguration(props) {
   const classes = useStyles();
 
-  const [videoEnabled, setVideoEnabled] = React.useState(true);
-  const [publicInCalls, setPublicInCalls] = React.useState(true);
-  const [autoAnswer, setAutoAnswer] = React.useState(false);
-  const [peerDiscovery, setPeerDiscovery] = React.useState(true);
-  const [rendezVous, setRendezVous] = React.useState(false);
+  const [videoEnabled, setVideoEnabled] = useState(true);
+  const [publicInCalls, setPublicInCalls] = useState(true);
+  const [autoAnswer, setAutoAnswer] = useState(false);
+  const [peerDiscovery, setPeerDiscovery] = useState(true);
+  const [rendezVous, setRendezVous] = useState(false);
 
-  const [selectedTurnOption, setSelectedTurnOption] = React.useState(
-    "defaultTurn"
-  );
-  const [selectedDHTProxyOption, setSelectedDHTProxyOption] = React.useState(
+  const [selectedTurnOption, setSelectedTurnOption] = useState("defaultTurn");
+  const [selectedDHTProxyOption, setSelectedDHTProxyOption] = useState(
     "defaultDHTProxy"
   );
-  const [upnpEnabled, setUpnpEnabled] = React.useState(true);
-  const [turnEnabled, setTurnEnabled] = React.useState(true);
-  const [turnServer, setTurnServer] = React.useState("turn.jami.net");
-  const [turnServerUserName, setTurnServerUserName] = React.useState("ring");
-  const [turnServerPassword, setTurnServerPassword] = React.useState("ring");
-  const [proxyEnabled, setProxyEnabled] = React.useState(false);
-  const [proxyServer, setProxyServer] = React.useState("dhtproxy.jami.net");
-  const [dhtProxyListUrl, setDhtProxyListUrl] = React.useState("");
-
-  const [turnPassowrdVisible, setTurnPasswordVisible] = React.useState(false);
-
-  const [open, setOpen] = React.useState(false);
-  const [message, setMessage] = React.useState(false);
-  const [severity, setSeverity] = React.useState("success");
+  const [upnpEnabled, setUpnpEnabled] = useState(true);
+  const [turnEnabled, setTurnEnabled] = useState(true);
+  const [turnServer, setTurnServer] = useState("turn.jami.net");
+  const [turnServerUserName, setTurnServerUserName] = useState("ring");
+  const [turnServerPassword, setTurnServerPassword] = useState("ring");
+  const [proxyEnabled, setProxyEnabled] = useState(false);
+  const [proxyServer, setProxyServer] = useState("dhtproxy.jami.net");
+  const [dhtProxyListUrl, setDhtProxyListUrl] = useState("");
+
+  const [turnPassowrdVisible, setTurnPasswordVisible] = useState(false);
+
+  const [open, setOpen] = useState(false);
+  const [message, setMessage] = useState(false);
+  const [severity, setSeverity] = useState("success");
 
   React.useEffect(() => {
     axios(
diff --git a/jams-react-client/src/views/Blueprint/EditBlueprintPermissions.js b/jams-react-client/src/views/Blueprint/EditBlueprintPermissions.js
index 68f2cab8087541e10d2f37aaf30caf9172adcd30..07bab39078586a0d0dc55506d6ee89cf94c00b9f 100644
--- a/jams-react-client/src/views/Blueprint/EditBlueprintPermissions.js
+++ b/jams-react-client/src/views/Blueprint/EditBlueprintPermissions.js
@@ -1,4 +1,4 @@
-import React from "react";
+import React, { useState } from "react";
 import { Link, useHistory } from "react-router-dom";
 // @material-ui/core components
 import { makeStyles } from "@material-ui/core/styles";
@@ -126,31 +126,31 @@ export default function EditBlueprintPermissions(props) {
 
   const tableCellClasses = classnames(classes.tableCell);
 
-  const [openDrawer, setOpenDrawer] = React.useState(false);
-  const [users, setUsers] = React.useState([]);
-  const [blueprintModerators, setBlueprintModerators] = React.useState([]);
-
-  const [videoEnabled, setVideoEnabled] = React.useState(true);
-  const [publicInCalls, setPublicInCalls] = React.useState(true);
-  const [autoAnswer, setAutoAnswer] = React.useState(false);
-  const [peerDiscovery, setPeerDiscovery] = React.useState(true);
-  const [rendezVous, setRendezVous] = React.useState(false);
-  const [defaultModerators, setDefaultModerators] = React.useState("");
-
-  const [upnpEnabled, setUpnpEnabled] = React.useState(true);
-  const [turnEnabled, setTurnEnabled] = React.useState(true);
-  const [turnServer, setTurnServer] = React.useState("turn.jami.net");
-  const [turnServerUserName, setTurnServerUserName] = React.useState("ring");
-  const [turnServerPassword, setTurnServerPassword] = React.useState("ring");
-  const [proxyEnabled, setProxyEnabled] = React.useState(false);
-  const [proxyServer, setProxyServer] = React.useState("dhtproxy.jami.net");
-  const [dhtProxyListUrl, setDhtProxyListUrl] = React.useState("");
-
-  const [allowLookup, setAllowLookup] = React.useState(true);
-
-  const [open, setOpen] = React.useState(false);
-  const [message, setMessage] = React.useState(false);
-  const [severity, setSeverity] = React.useState("success");
+  const [openDrawer, setOpenDrawer] = useState(false);
+  const [users, setUsers] = useState([]);
+  const [blueprintModerators, setBlueprintModerators] = useState([]);
+
+  const [videoEnabled, setVideoEnabled] = useState(true);
+  const [publicInCalls, setPublicInCalls] = useState(true);
+  const [autoAnswer, setAutoAnswer] = useState(false);
+  const [peerDiscovery, setPeerDiscovery] = useState(true);
+  const [rendezVous, setRendezVous] = useState(false);
+  const [defaultModerators, setDefaultModerators] = useState("");
+
+  const [upnpEnabled, setUpnpEnabled] = useState(true);
+  const [turnEnabled, setTurnEnabled] = useState(true);
+  const [turnServer, setTurnServer] = useState("turn.jami.net");
+  const [turnServerUserName, setTurnServerUserName] = useState("ring");
+  const [turnServerPassword, setTurnServerPassword] = useState("ring");
+  const [proxyEnabled, setProxyEnabled] = useState(false);
+  const [proxyServer, setProxyServer] = useState("dhtproxy.jami.net");
+  const [dhtProxyListUrl, setDhtProxyListUrl] = useState("");
+
+  const [allowLookup, setAllowLookup] = useState(true);
+
+  const [open, setOpen] = useState(false);
+  const [message, setMessage] = useState(false);
+  const [severity, setSeverity] = useState("success");
 
   const searchUsers = (value) => {
     axios(
diff --git a/jams-react-client/src/views/Blueprints/Blueprints.js b/jams-react-client/src/views/Blueprints/Blueprints.js
index 4cbc643b82f76fdd51a9a3beb360c335a3e84132..4eb1f5d9c843a84adea24ad3ef107c7d013aa120 100644
--- a/jams-react-client/src/views/Blueprints/Blueprints.js
+++ b/jams-react-client/src/views/Blueprints/Blueprints.js
@@ -1,4 +1,4 @@
-import React, { useCallback, useEffect } from "react";
+import React, { useCallback, useEffect, useState } from "react";
 import { Link, useHistory } from "react-router-dom";
 // @material-ui/core components
 import { makeStyles } from "@material-ui/core/styles";
@@ -89,22 +89,22 @@ const useStyles = makeStyles(styles);
 export default function Blueprints() {
   const classes = useStyles();
   const history = useHistory();
-  const [blueprints, setBlueprints] = React.useState([]);
-  const [selectedBlueprint, setSelectedBlueprint] = React.useState(false);
-  const [selectedBlueprintName, setSelectedBlueprintName] = React.useState("");
-  const [loading, setLoading] = React.useState(false);
-  const [zeroBlueprint, setZeroBlueprint] = React.useState(false);
-  const [progress, setProgress] = React.useState(0);
-  const [searchValue, setSearchValue] = React.useState(false);
+  const [blueprints, setBlueprints] = useState([]);
+  const [selectedBlueprint, setSelectedBlueprint] = useState(false);
+  const [selectedBlueprintName, setSelectedBlueprintName] = useState("");
+  const [loading, setLoading] = useState(false);
+  const [zeroBlueprint, setZeroBlueprint] = useState(false);
+  const [progress, setProgress] = useState(0);
+  const [searchValue, setSearchValue] = useState(false);
 
-  const [blueprintName, setBlueprintName] = React.useState("");
-  const [blueprintNameExits, setBlueprintNameExits] = React.useState();
-  const [open, setOpen] = React.useState(false);
+  const [blueprintName, setBlueprintName] = useState("");
+  const [blueprintNameExits, setBlueprintNameExits] = useState();
+  const [open, setOpen] = useState(false);
 
-  const [disableCreate, setDisableCreate] = React.useState(true);
+  const [disableCreate, setDisableCreate] = useState(true);
 
-  const [removedBlueprint, setRemovedBlueprint] = React.useState("");
-  const [openRemoveDialog, setOpenRemoveDialog] = React.useState(false);
+  const [removedBlueprint, setRemovedBlueprint] = useState("");
+  const [openRemoveDialog, setOpenRemoveDialog] = useState(false);
 
   useEffect(() => {
     setLoading(true);
diff --git a/jams-react-client/src/views/Contacts/Contacts.js b/jams-react-client/src/views/Contacts/Contacts.js
index 579ee4b4147e4c8a8f9a4e43e94da47a79b49712..65d04d008c853e89bf0ce3780db668256612da00 100644
--- a/jams-react-client/src/views/Contacts/Contacts.js
+++ b/jams-react-client/src/views/Contacts/Contacts.js
@@ -1,4 +1,4 @@
-import React, { useEffect } from "react";
+import React, { useEffect, useState } from "react";
 import { Link, useHistory } from "react-router-dom";
 // @material-ui/core components
 import { makeStyles } from "@material-ui/core/styles";
@@ -86,16 +86,16 @@ const useStyles = makeStyles(styles);
 export default function Users(props) {
   const classes = useStyles();
   const history = useHistory();
-  const [contacts, setContacts] = React.useState([]);
-  const [users, setUsers] = React.useState([]);
-  const [searchValue, setSearchValue] = React.useState(null);
-  const [loading, setLoading] = React.useState(false);
-  const [progress, setProgress] = React.useState(0);
-  const [openDrawer, setOpenDrawer] = React.useState(false);
-  const [removedContact, setRemovedContact] = React.useState();
-  const [removedContactName, setRemovedContactName] = React.useState();
-  const [open, setOpen] = React.useState(false);
-  const [allowedToAdd, setAllowedToAdd] = React.useState(true);
+  const [contacts, setContacts] = useState([]);
+  const [users, setUsers] = useState([]);
+  const [searchValue, setSearchValue] = useState(null);
+  const [loading, setLoading] = useState(false);
+  const [progress, setProgress] = useState(0);
+  const [openDrawer, setOpenDrawer] = useState(false);
+  const [removedContact, setRemovedContact] = useState();
+  const [removedContactName, setRemovedContactName] = useState();
+  const [open, setOpen] = useState(false);
+  const [allowedToAdd, setAllowedToAdd] = useState(true);
 
   const searchContacts = (value) => {
     axios(
diff --git a/jams-react-client/src/views/Groups/EditGroup.js b/jams-react-client/src/views/Groups/EditGroup.js
index 540020f2572cd1506216cb910bf1f962ed3839df..d83705d07d2b5f9040c41c866ba0445fa0b7b6e8 100644
--- a/jams-react-client/src/views/Groups/EditGroup.js
+++ b/jams-react-client/src/views/Groups/EditGroup.js
@@ -1,4 +1,4 @@
-import React, { useCallback } from "react";
+import React, { useCallback, useState } from "react";
 import { Link, useHistory } from "react-router-dom";
 import classnames from "classnames";
 
@@ -113,17 +113,17 @@ export default function EditGroup(props) {
   const classes = useStyles();
   const history = useHistory();
 
-  const [name, setName] = React.useState("");
-  const [newName, setNewName] = React.useState("");
-  const [blueprints, setBlueprints] = React.useState([]);
-  const [selectedBlueprint, setSelectedBlueprint] = React.useState({
+  const [name, setName] = useState("");
+  const [newName, setNewName] = useState("");
+  const [blueprints, setBlueprints] = useState([]);
+  const [selectedBlueprint, setSelectedBlueprint] = useState({
     value: 0,
     label: "No blueprint",
   });
-  const [groupMembers, setGroupMembers] = React.useState([]);
-  const [openDrawer, setOpenDrawer] = React.useState(false);
-  const [groupNameExits, setGroupNameExits] = React.useState(false);
-  const [users, setUsers] = React.useState([]);
+  const [groupMembers, setGroupMembers] = useState([]);
+  const [openDrawer, setOpenDrawer] = useState(false);
+  const [groupNameExits, setGroupNameExits] = useState(false);
+  const [users, setUsers] = useState([]);
 
   const getUserInfo = (username) =>
     new Promise((resolve, reject) => {
diff --git a/jams-react-client/src/views/Groups/Groups.js b/jams-react-client/src/views/Groups/Groups.js
index 3c7fc79f63d3b5fb9dbd233f4a78f8f0ba8a664e..f97d87c9d918869e77804fd8a91abfde2595081c 100644
--- a/jams-react-client/src/views/Groups/Groups.js
+++ b/jams-react-client/src/views/Groups/Groups.js
@@ -98,25 +98,25 @@ const useStyles = makeStyles(styles);
 export default function Groups() {
   const classes = useStyles();
   const history = useHistory();
-  const [groups, setGroups] = React.useState([]);
-  const [loading, setLoading] = React.useState(false);
-  const [zeroGroup, setZeroGroup] = React.useState(false);
-  const [progress, setProgress] = React.useState(0);
-  const [searchValue, setSearchValue] = React.useState(null);
+  const [groups, setGroups] = useState([]);
+  const [loading, setLoading] = useState(false);
+  const [zeroGroup, setZeroGroup] = useState(false);
+  const [progress, setProgress] = useState(0);
+  const [searchValue, setSearchValue] = useState(null);
 
-  const [blueprints, setBlueprints] = React.useState([]);
+  const [blueprints, setBlueprints] = useState([]);
 
-  const [openCreate, setOpenCreate] = React.useState(false);
-  const [groupName, setGroupName] = React.useState("");
-  const [groupNameExits, setGroupNameExits] = React.useState(false);
+  const [openCreate, setOpenCreate] = useState(false);
+  const [groupName, setGroupName] = useState("");
+  const [groupNameExits, setGroupNameExits] = useState(false);
 
-  const [removedGroup, setRemovedGroup] = React.useState({
+  const [removedGroup, setRemovedGroup] = useState({
     id: 0,
     name: "groupeName",
   });
-  const [openRemoveDialog, setOpenRemoveDialog] = React.useState();
+  const [openRemoveDialog, setOpenRemoveDialog] = useState();
 
-  const [disableCreate, setDisableCreate] = React.useState(true);
+  const [disableCreate, setDisableCreate] = useState(true);
 
   const handleRemoveGroup = (group) => {
     setRemovedGroup(group);
@@ -397,10 +397,7 @@ export default function Groups() {
             </DialogContentText>
           </DialogContent>
           <DialogActions>
-            <Button
-              onClick={handleCloseCreate}
-              color="primary"
-            >
+            <Button onClick={handleCloseCreate} color="primary">
               Cancel
             </Button>
             <Button
diff --git a/jams-react-client/src/views/Settings/General.js b/jams-react-client/src/views/Settings/General.js
index 4239499d63f7023187815bcd984c5a98aa7299e1..be1190ebb5dc791c7e14da334a57def94b212753 100644
--- a/jams-react-client/src/views/Settings/General.js
+++ b/jams-react-client/src/views/Settings/General.js
@@ -1,4 +1,4 @@
-import React from "react";
+import React, { useState } from "react";
 import { Formik } from "formik";
 import FormikField from "components/FormikField/FormikField";
 import * as Yup from "yup";
@@ -58,9 +58,9 @@ const useStyles = makeStyles((theme) => ({
 export default function General(props) {
   const classes = useStyles();
 
-  const [copied, setCopied] = React.useState(false);
-  const [generated, setGenerated] = React.useState(false);
-  const [passwordVisible, setPasswordVisible] = React.useState(false);
+  const [copied, setCopied] = useState(false);
+  const [generated, setGenerated] = useState(false);
+  const [passwordVisible, setPasswordVisible] = useState(false);
 
   const changePassword = (values) => {
     const data = {
diff --git a/jams-react-client/src/views/Settings/Settings.js b/jams-react-client/src/views/Settings/Settings.js
index 7b0852c09763db023e6c8a15fc5e000fdb25b40b..d58e0d1b69ff8aad2c0b47fe60bbb66a811b90fb 100644
--- a/jams-react-client/src/views/Settings/Settings.js
+++ b/jams-react-client/src/views/Settings/Settings.js
@@ -1,4 +1,4 @@
-import React from "react";
+import React, { useState } from "react";
 // core components
 import General from "./General";
 import Subscription from "./Subscription";
@@ -74,10 +74,10 @@ const styles = {
 };
 
 export default function Settings(props) {
-  const [value, setValue] = React.useState(0);
-  const [error, setError] = React.useState(false);
-  const [severity, setSeverity] = React.useState("error");
-  const [errorMessage, setErrorMessage] = React.useState("Test");
+  const [value, setValue] = useState(0);
+  const [error, setError] = useState(false);
+  const [severity, setSeverity] = useState("error");
+  const [errorMessage, setErrorMessage] = useState("Test");
 
   const handleChange = (event, newValue) => {
     setValue(newValue);
diff --git a/jams-react-client/src/views/Settings/Subscription.js b/jams-react-client/src/views/Settings/Subscription.js
index 1dbfa96fdd912e96e051c4cf44d17341ed3363b3..3b55b3d00b637ced16e32edcacfa656a72fb1be0 100644
--- a/jams-react-client/src/views/Settings/Subscription.js
+++ b/jams-react-client/src/views/Settings/Subscription.js
@@ -1,4 +1,4 @@
-import React, { useEffect } from "react";
+import React, { useEffect, useState } from "react";
 import { useFormik } from "formik";
 import * as Yup from "yup";
 import Button from "@material-ui/core/Button";
@@ -40,7 +40,7 @@ const useStyles = makeStyles((theme) => ({
 
 export default function Subscription(props) {
   const classes = useStyles();
-  const [activated, setActivated] = React.useState(false);
+  const [activated, setActivated] = useState(false);
 
   useEffect(() => {
     axios(
diff --git a/jams-react-client/src/views/UserProfile/DisplayUserProfile.js b/jams-react-client/src/views/UserProfile/DisplayUserProfile.js
index 2a258d5cd85389ba165b26d891fb0bd12b2c1073..ed7b2b0d051b7fdea5ca8d6a05bcc7ad5df4dd5f 100644
--- a/jams-react-client/src/views/UserProfile/DisplayUserProfile.js
+++ b/jams-react-client/src/views/UserProfile/DisplayUserProfile.js
@@ -1,4 +1,4 @@
-import React, { useEffect } from "react";
+import React, { useEffect, useState } from "react";
 import { Link, useHistory } from "react-router-dom";
 import classnames from "classnames";
 
@@ -198,16 +198,16 @@ const useStyles = makeStyles(styles);
 export default function DisplayUserProfile(props) {
   const classes = useStyles();
   const history = useHistory();
-  const [user, setUser] = React.useState([]);
-  const [groupMemberships, setGroupMemberships] = React.useState([]);
-  const [revoked, setRevoked] = React.useState(false);
-  const [open, setOpen] = React.useState(false);
-  const [revokedUser, setRevokedUser] = React.useState("");
-  const [changePasswordOpen, setChangePasswordOpen] = React.useState(false);
-  const [loading, setLoading] = React.useState(false);
-  const [progress, setProgress] = React.useState(0);
-  const [groups, setGroups] = React.useState([]);
-  const [openDrawer, setOpenDrawer] = React.useState(false);
+  const [user, setUser] = useState([]);
+  const [groupMemberships, setGroupMemberships] = useState([]);
+  const [revoked, setRevoked] = useState(false);
+  const [open, setOpen] = useState(false);
+  const [revokedUser, setRevokedUser] = useState("");
+  const [changePasswordOpen, setChangePasswordOpen] = useState(false);
+  const [loading, setLoading] = useState(false);
+  const [progress, setProgress] = useState(0);
+  const [groups, setGroups] = useState([]);
+  const [openDrawer, setOpenDrawer] = useState(false);
 
   const searchGroups = (value) => {
     if (value === "") value = "*";
diff --git a/jams-react-client/src/views/UserProfile/EditCreateUserProfile.js b/jams-react-client/src/views/UserProfile/EditCreateUserProfile.js
index 58832b73d6bb3d36f39960d8b6c18a8b483fefa7..4eeb9a9a1cb7244f01bd416420eb5b37e8a8738b 100644
--- a/jams-react-client/src/views/UserProfile/EditCreateUserProfile.js
+++ b/jams-react-client/src/views/UserProfile/EditCreateUserProfile.js
@@ -1,4 +1,4 @@
-import React from "react";
+import React, { useState } from "react";
 import { useHistory } from "react-router-dom";
 
 // @material-ui/core components
@@ -223,24 +223,24 @@ const useStyles = makeStyles(styles);
 export default function EditCreateUserProfile(props) {
   const classes = useStyles();
   const history = useHistory();
-  const [copied, setCopied] = React.useState(false);
-  const [generated, setGenerated] = React.useState(true);
-  const [userExists, setUserExists] = React.useState(false);
-  const [userName, setUserName] = React.useState("");
-  const [loading, setLoading] = React.useState(false);
-  const [progress, setProgress] = React.useState(0);
+  const [copied, setCopied] = useState(false);
+  const [generated, setGenerated] = useState(true);
+  const [userExists, setUserExists] = useState(false);
+  const [userName, setUserName] = useState("");
+  const [loading, setLoading] = useState(false);
+  const [progress, setProgress] = useState(0);
 
-  const [profilePicture, setProfilePicture] = React.useState("");
-  const [profilePicturePreview, setProfilePicturePreview] = React.useState(
+  const [profilePicture, setProfilePicture] = useState("");
+  const [profilePicturePreview, setProfilePicturePreview] = useState(
     noProfilePicture
   );
-  const [originalUploadedImage, setOriginalUploadedImage] = React.useState("");
+  const [originalUploadedImage, setOriginalUploadedImage] = useState("");
 
-  const [open, setOpen] = React.useState(false);
-  const [crop, setCrop] = React.useState({ x: 0, y: 0 });
-  const [zoom, setZoom] = React.useState(1);
-  const [rotation, setRotation] = React.useState(0);
-  const [passwordVisible, setPasswordVisible] = React.useState(false);
+  const [open, setOpen] = useState(false);
+  const [crop, setCrop] = useState({ x: 0, y: 0 });
+  const [zoom, setZoom] = useState(1);
+  const [rotation, setRotation] = useState(0);
+  const [passwordVisible, setPasswordVisible] = useState(false);
 
   const passwordGenerator = () => {
     return generator.generate({
@@ -253,7 +253,7 @@ export default function EditCreateUserProfile(props) {
 
   const intialyGeneratedPassword = passwordGenerator();
 
-  const [initialValues, setInitialValues] = React.useState({
+  const [initialValues, setInitialValues] = useState({
     username: "",
     password: intialyGeneratedPassword,
     confirmPassword: intialyGeneratedPassword,
diff --git a/jams-react-client/src/views/UserProfile/UserProfile.js b/jams-react-client/src/views/UserProfile/UserProfile.js
index 62cc5dc841c5cc570c51e492d9ede32439b146e1..7fd8ca95af7b371d484547f6b2a27871aec7fcc3 100755
--- a/jams-react-client/src/views/UserProfile/UserProfile.js
+++ b/jams-react-client/src/views/UserProfile/UserProfile.js
@@ -1,4 +1,4 @@
-import React from "react";
+import React, { useState } from "react";
 import { useHistory } from "react-router-dom";
 // core components
 import Devices from "components/Devices/Devices.js";
@@ -57,8 +57,8 @@ function a11yProps(index) {
 export default function UserProfile(props) {
   const history = useHistory();
 
-  const [value, setValue] = React.useState(0);
-  const [displayUser, setDisplayUser] = React.useState(true);
+  const [value, setValue] = useState(0);
+  const [displayUser, setDisplayUser] = useState(true);
 
   const handleChange = (event, newValue) => {
     setValue(newValue);
diff --git a/jams-react-client/src/views/Users/Users.js b/jams-react-client/src/views/Users/Users.js
index 59ce0c9f783d6ad7a47f2d5504df8234d75d77d1..65a0429d5eb18f8258ea0cfe72ffd08ecb94ba06 100644
--- a/jams-react-client/src/views/Users/Users.js
+++ b/jams-react-client/src/views/Users/Users.js
@@ -75,20 +75,20 @@ const useStyles = makeStyles(styles);
 export default function Users(props) {
   const classes = useStyles();
   const history = useHistory();
-  const [users, setUsers] = React.useState([]);
-  const [noUsersFound, setNoUsersFound] = React.useState(false);
-  const [noMatchFound, setNoMatchFound] = React.useState(false);
-  const [selectedUsername, setSelectedUsername] = React.useState("");
-  const [createUser, setCreateUser] = React.useState(false);
-  const [loading, setLoading] = React.useState(false);
-  const [progress, setProgress] = React.useState(0);
-  const [showRevokedUsers, setShowRevokedUsers] = React.useState(false);
+  const [users, setUsers] = useState([]);
+  const [noUsersFound, setNoUsersFound] = useState(false);
+  const [noMatchFound, setNoMatchFound] = useState(false);
+  const [selectedUsername, setSelectedUsername] = useState("");
+  const [createUser, setCreateUser] = useState(false);
+  const [loading, setLoading] = useState(false);
+  const [progress, setProgress] = useState(0);
+  const [showRevokedUsers, setShowRevokedUsers] = useState(false);
 
-  const [searchValue, setSearchValue] = React.useState("");
+  const [searchValue, setSearchValue] = useState("");
 
-  const [selectedPage, setSelectedPage] = React.useState(1);
+  const [selectedPage, setSelectedPage] = useState(1);
 
-  const [numberPages, setNumberPages] = React.useState(1);
+  const [numberPages, setNumberPages] = useState(1);
   useEffect(() => {
     setLoading(true);
     const timer = setInterval(() => {