diff --git a/client/src/pages/accountCreation.jsx b/client/src/pages/accountCreation.jsx
index f4d3921..cd948a2 100644
--- a/client/src/pages/accountCreation.jsx
+++ b/client/src/pages/accountCreation.jsx
@@ -1,5 +1,6 @@
-import { Container, Card, CardContent, Typography, List, Avatar, Divider } from '@mui/material';
 import { DialerSipRounded, GroupOutlined, RoomRounded } from '@mui/icons-material';
+import { Avatar, Card, CardContent, Container, Divider, List, Typography } from '@mui/material';
+
 import ListItemLink from '../components/ListItemLink';
 
 export default function AccountCreationDialog(props) {
diff --git a/client/src/pages/accountSelection.jsx b/client/src/pages/accountSelection.jsx
index 77c033a..8d96885 100644
--- a/client/src/pages/accountSelection.jsx
+++ b/client/src/pages/accountSelection.jsx
@@ -1,14 +1,15 @@
-import { Fragment, useEffect, useState } from 'react';
-import { Avatar, Card, CardHeader, Container, List } from '@mui/material';
-import Header from '../components/Header';
-import authManager from '../AuthManager';
-import Account from '../../../model/Account';
-import LoadingPage from '../components/loading';
-import ListItemLink from '../components/ListItemLink';
-import ConversationAvatar from '../components/ConversationAvatar';
 import { AddRounded } from '@mui/icons-material';
-import { useNavigate } from 'react-router';
+import { Avatar, Card, CardHeader, Container, List } from '@mui/material';
 import { motion } from 'framer-motion';
+import { Fragment, useEffect, useState } from 'react';
+import { useNavigate } from 'react-router';
+
+import Account from '../../../model/Account';
+import authManager from '../AuthManager';
+import ConversationAvatar from '../components/ConversationAvatar';
+import Header from '../components/Header';
+import ListItemLink from '../components/ListItemLink';
+import LoadingPage from '../components/loading';
 
 const variants = {
   enter: { opacity: 1, y: 0 },
diff --git a/client/src/pages/accountSettings.jsx b/client/src/pages/accountSettings.jsx
index e7d08c2..ed580e2 100644
--- a/client/src/pages/accountSettings.jsx
+++ b/client/src/pages/accountSettings.jsx
@@ -1,12 +1,13 @@
+import { CircularProgress, Container } from '@mui/material';
 import { useEffect, useState } from 'react';
 import { useParams } from 'react-router';
-import { Container, CircularProgress } from '@mui/material';
-import Header from '../components/Header';
-import AccountPreferences from '../components/AccountPreferences';
-import authManager from '../AuthManager';
+
 import Account from '../../../model/Account';
-import { useAppDispatch } from '../../redux/hooks';
 import { setAccountId, setAccountObject } from '../../redux/appSlice';
+import { useAppDispatch } from '../../redux/hooks';
+import authManager from '../AuthManager';
+import AccountPreferences from '../components/AccountPreferences';
+import Header from '../components/Header';
 
 const AccountSettings = (props) => {
   console.log('ACCOUNT SETTINGS', props.account);
diff --git a/client/src/pages/addContactPage.jsx b/client/src/pages/addContactPage.jsx
index 0fbd21b..c1b242f 100644
--- a/client/src/pages/addContactPage.jsx
+++ b/client/src/pages/addContactPage.jsx
@@ -1,10 +1,10 @@
+import GroupAddRounded from '@mui/icons-material/GroupAddRounded';
+import { Box, Card, CardContent, Container, Fab, Typography } from '@mui/material';
 import { useNavigate } from 'react-router-dom';
 
-import { Box, Container, Fab, Card, CardContent, Typography } from '@mui/material';
-import GroupAddRounded from '@mui/icons-material/GroupAddRounded';
-import authManager from '../AuthManager';
-import { useAppDispatch } from '../../redux/hooks';
 import { setRefreshFromSlice } from '../../redux/appSlice';
+import { useAppDispatch } from '../../redux/hooks';
+import authManager from '../AuthManager';
 
 export default function AddContactPage(props) {
   const navigate = useNavigate();
diff --git a/client/src/pages/jamiAccountCreation.jsx b/client/src/pages/jamiAccountCreation.jsx
index 8d47b48..fbff909 100644
--- a/client/src/pages/jamiAccountCreation.jsx
+++ b/client/src/pages/jamiAccountCreation.jsx
@@ -1,10 +1,11 @@
-import { useState } from 'react';
-import { Container, Card, CardContent, Typography, Fab, CardActions, Box } from '@mui/material';
 import { AddRounded } from '@mui/icons-material';
-import UsernameChooser from '../components/UsernameChooser';
-import authManager from '../AuthManager';
+import { Box, Card, CardActions, CardContent, Container, Fab, Typography } from '@mui/material';
+import { useState } from 'react';
 import { useNavigate } from 'react-router';
 
+import authManager from '../AuthManager';
+import UsernameChooser from '../components/UsernameChooser';
+
 export default function JamiAccountDialog(props) {
   const [name, setName] = useState('');
   const [loading, setLoading] = useState(false);
diff --git a/client/src/pages/loginDialog.jsx b/client/src/pages/loginDialog.jsx
index 9a7ff0c..34070d7 100644
--- a/client/src/pages/loginDialog.jsx
+++ b/client/src/pages/loginDialog.jsx
@@ -1,15 +1,14 @@
-import { Component } from 'react';
-
 import Button from '@mui/material/Button';
-import TextField from '@mui/material/TextField';
-import FormControlLabel from '@mui/material/FormControlLabel';
 import Checkbox from '@mui/material/Checkbox';
-import Link from '@mui/material/Link';
-import Typography from '@mui/material/Typography';
-import DialogTitle from '@mui/material/DialogTitle';
 import Dialog from '@mui/material/Dialog';
 import DialogActions from '@mui/material/DialogActions';
 import DialogContent from '@mui/material/DialogContent';
+import DialogTitle from '@mui/material/DialogTitle';
+import FormControlLabel from '@mui/material/FormControlLabel';
+import Link from '@mui/material/Link';
+import TextField from '@mui/material/TextField';
+import Typography from '@mui/material/Typography';
+import { Component } from 'react';
 
 import authManager from '../AuthManager';
 
diff --git a/client/src/pages/messenger.jsx b/client/src/pages/messenger.jsx
index f8d5907..3108fe6 100644
--- a/client/src/pages/messenger.jsx
+++ b/client/src/pages/messenger.jsx
@@ -1,18 +1,18 @@
+import { Stack } from '@mui/material';
 import { useEffect, useState } from 'react';
-import Header from '../components/Header';
-import NewContactForm from '../components/NewContactForm';
+import { useParams } from 'react-router';
 
+import Contact from '../../../model/Contact';
+import Conversation from '../../../model/Conversation';
+import { useAppSelector } from '../../redux/hooks';
+import authManager from '../AuthManager';
 //import Sound from 'react-sound';
 import ConversationList from '../components/ConversationList';
-import authManager from '../AuthManager';
-import Conversation from '../../../model/Conversation';
-import Contact from '../../../model/Contact';
 import ConversationView from '../components/ConversationView';
-import AddContactPage from './addContactPage.jsx';
+import Header from '../components/Header';
 import LoadingPage from '../components/loading';
-import { useParams } from 'react-router';
-import { Stack } from '@mui/material';
-import { useAppSelector } from '../../redux/hooks';
+import NewContactForm from '../components/NewContactForm';
+import AddContactPage from './addContactPage.jsx';
 
 const Messenger = (props) => {
   const { refresh } = useAppSelector((state) => state.app);
diff --git a/client/src/pages/serverConfiguration.jsx b/client/src/pages/serverConfiguration.jsx
index 8ac85df..da6250a 100644
--- a/client/src/pages/serverConfiguration.jsx
+++ b/client/src/pages/serverConfiguration.jsx
@@ -1,9 +1,10 @@
-import Header from '../components/Header';
-import AccountPreferences from '../components/AccountPreferences';
-import Container from '@mui/material/Container';
 import CircularProgress from '@mui/material/CircularProgress';
-import authManager from '../AuthManager';
+import Container from '@mui/material/Container';
+
 import Account from '../../../model/Account';
+import authManager from '../AuthManager';
+import AccountPreferences from '../components/AccountPreferences';
+import Header from '../components/Header';
 
 const ServerOverview = (props) => {
   this.accountId = props.accountId || props.match.params.accountId;
diff --git a/client/src/pages/serverSetup.jsx b/client/src/pages/serverSetup.jsx
index cf9b3eb..95fc032 100644
--- a/client/src/pages/serverSetup.jsx
+++ b/client/src/pages/serverSetup.jsx
@@ -1,7 +1,7 @@
+import GroupAddRounded from '@mui/icons-material/GroupAddRounded';
+import { Box, Card, CardContent, Container, Fab, Input, Typography } from '@mui/material';
 import { useState } from 'react';
 
-import { Box, Container, Fab, Card, CardContent, Typography, Input } from '@mui/material';
-import GroupAddRounded from '@mui/icons-material/GroupAddRounded';
 import authManager from '../AuthManager';
 
 export default function ServerSetup(props) {