diff --git a/src/components/DataTable.js b/src/components/DataTable.js
index d6d0a7292b86bb7412af18f72512ee30aa553e1c..7053f9b5575219bbcb2632c8f4e0f3b11b857d5d 100644
--- a/src/components/DataTable.js
+++ b/src/components/DataTable.js
@@ -104,7 +104,7 @@ DataTable.propTypes = {
     })
   ),
   initialized: PropTypes.bool,
-  rest: PropTypes.string.isRequired,
+  rest: PropTypes.string,
 };
 
 DataTable.defaultProps = {
diff --git a/src/components/NavBar.js b/src/components/NavBar.js
index 1293fc95f2882553b67f3bf95a7049c56dc85d0c..569d706c13c50b74a64d5b721e7b91a3cf9af0f6 100644
--- a/src/components/NavBar.js
+++ b/src/components/NavBar.js
@@ -94,7 +94,7 @@ const NavBar = ({ open, handleOpen }) => {
         </Typography>
         {isAuthenticated && (
           <IconButton color="inherit">
-            <Badge badgeContent={4} color="secondary">
+            <Badge badgeContent={4} color="secondary" overlap="rectangular">
               <NotificationsIcon />
             </Badge>
           </IconButton>
diff --git a/src/components/Navigation.js b/src/components/Navigation.js
index 20b3aa2b8ac55012f8c431a40c341f15b46e9a5e..7cea713f85687555b48414cc6e2724fd0cfb9644 100644
--- a/src/components/Navigation.js
+++ b/src/components/Navigation.js
@@ -29,7 +29,7 @@ const Navigation = () => {
   return (
     <div>
       <RouterNavLink to="/home-page" className={clsx(styles.link)}>
-        <ListItem button selected={pathname === '/home-page' && !type ? 'selected' : null}>
+        <ListItem button selected={pathname === '/home-page' && !type}>
           <ListItemIcon>
             <WbSunnyIcon />
           </ListItemIcon>
@@ -37,7 +37,7 @@ const Navigation = () => {
         </ListItem>
       </RouterNavLink>
       <RouterNavLink to="/home-page?type=air" className={clsx(styles.link)}>
-        <ListItem button selected={pathname === '/home-page' && type === 'air' ? 'selected' : null}>
+        <ListItem button selected={pathname === '/home-page' && type === 'air'}>
           <ListItemIcon>
             <WavesIcon />
           </ListItemIcon>
@@ -45,14 +45,14 @@ const Navigation = () => {
         </ListItem>
       </RouterNavLink>
       <RouterNavLink to="/home-page?type=temp" className={clsx(styles.link)}>
-        <ListItem button selected={pathname === '/home-page' && type === 'temp' ? 'selected' : null}>
+        <ListItem button selected={pathname === '/home-page' && type === 'temp'}>
           <ListItemIcon>
             <AcUnitIcon />
           </ListItemIcon>
           <ListItemText primary="Temperture" />
         </ListItem>
       </RouterNavLink>
-      <RouterNavLink to="/chart" className={({ isActive }) => [clsx(styles.link), isActive ? 'selected' : null].join(' ')}>
+      <RouterNavLink to="/chart" className={clsx(styles.link)}>
         <ListItem button selected={pathname === '/chart'}>
           <ListItemIcon>
             <ShowChartIcon />
diff --git a/src/views/HomePage.js b/src/views/HomePage.js
index ea9b0252d12287f0c6d083860acdbd021125df2d..0ba5d8a0dbaf2c758fa31ef0a522d3061b70f524 100644
--- a/src/views/HomePage.js
+++ b/src/views/HomePage.js
@@ -68,13 +68,13 @@ const HomePage = () => {
   return (
     <div>
       <h1>{typeMapper[type || '']}</h1>
-      <Grid container spacing={3} justify="space-between">
+      <Grid container spacing={3} justifyContent="space-between">
         <Grid item>
           <Autocomplete
             style={{ minWidth: '300px' }}
             options={restTypesMapper[type || '']}
             id="rest-type-picker"
-            value={rest}
+            value={rest || ''}
             onChange={(e, filter) => setRestApi(({ resource }) => ({ resource, rest: filter }))}
             disabled={!initialized}
             renderInput={(params) => <TextField {...params} label="Select rest type" margin="normal" />}
@@ -83,7 +83,7 @@ const HomePage = () => {
       </Grid>
 
       <Toolbar>
-        <Grid container spacing={3} justify="space-between">
+        <Grid container spacing={3} justifyContent="space-between">
           <Grid item>
             <Autocomplete
               style={{ minWidth: '150px' }}