diff --git a/package-lock.json b/package-lock.json
index 64cd00f2..834823ad 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -16248,9 +16248,9 @@
       }
     },
     "notistack": {
-      "version": "0.9.17",
-      "resolved": "https://registry.npmjs.org/notistack/-/notistack-0.9.17.tgz",
-      "integrity": "sha512-nypTN6sEe+q98wMaxF/UwatA1yAq948+bZOo9JKYR+tU65DW0ipWyx8DseJ3UJYvb6VDD+Fqo83qwayQ46bEEA==",
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/notistack/-/notistack-1.0.10.tgz",
+      "integrity": "sha512-z0y4jJaVtOoH3kc3GtNUlhNTY+5LE04QDeLVujX3VPhhzg67zw055mZjrBF+nzpv3V9aiPNph1EgRU4+t8kQTQ==",
       "requires": {
         "clsx": "^1.1.0",
         "hoist-non-react-statics": "^3.3.0"
@@ -16718,9 +16718,9 @@
       "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A="
     },
     "path-parse": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz",
-      "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw=="
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
+      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="
     },
     "path-to-regexp": {
       "version": "1.8.0",
@@ -20819,9 +20819,9 @@
       "integrity": "sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA=="
     },
     "tar": {
-      "version": "6.1.6",
-      "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.6.tgz",
-      "integrity": "sha512-oaWyu5dQbHaYcyZCTfyPpC+VmI62/OM2RTUYavTk1MDr1cwW5Boi3baeYQKiZbY2uSQJGr+iMOzb/JFxLrft+g==",
+      "version": "6.1.11",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.11.tgz",
+      "integrity": "sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA==",
       "requires": {
         "chownr": "^2.0.0",
         "fs-minipass": "^2.0.0",
@@ -21528,9 +21528,9 @@
       }
     },
     "url-parse": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.1.tgz",
-      "integrity": "sha512-HOfCOUJt7iSYzEx/UqgtwKRMC6EU91NFhsCHMv9oM03VJcVo2Qrp8T8kI9D7amFf1cu+/3CEhgb3rF9zL7k85Q==",
+      "version": "1.5.3",
+      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.3.tgz",
+      "integrity": "sha512-IIORyIQD9rvj0A4CLWsHkBBJuNqWpFQe224b6j9t/ABmquIS0qDU2pY6kl6AuOrL5OkCXHMCFNe1jBcuAggjvQ==",
       "requires": {
         "querystringify": "^2.1.1",
         "requires-port": "^1.0.0"
@@ -21963,8 +21963,7 @@
         },
         "ssri": {
           "version": "6.0.1",
-          "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz",
-          "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==",
+          "resolved": "",
           "requires": {
             "figgy-pudding": "^3.5.1"
           }
diff --git a/package.json b/package.json
index 1d4cedb6..7275060d 100644
--- a/package.json
+++ b/package.json
@@ -14,7 +14,7 @@
     "konva": "^7.0.3",
     "lint-staged": "^10.5.4",
     "material-ui-popup-state": "^1.8.3",
-    "notistack": "^0.9.17",
+    "notistack": "^1.0.10",
     "prettier": "^2.2.1",
     "qs": "^6.9.4",
     "react": "^16.13.1",
diff --git a/src/components/BuildList/index.tsx b/src/components/BuildList/index.tsx
index b787dd53..368efd63 100644
--- a/src/components/BuildList/index.tsx
+++ b/src/components/BuildList/index.tsx
@@ -44,11 +44,6 @@ const useStyles = makeStyles((theme: Theme) =>
     listItemSecondaryAction: {
       visibility: "hidden",
     },
-    listItem: {
-      "&:hover $listItemSecondaryAction": {
-        visibility: "inherit",
-      },
-    },
   })
 );
 
@@ -125,9 +120,6 @@ const BuildList: FunctionComponent = () => {
                   onClick={() => {
                     selectBuild(buildDispatch, build.id);
                   }}
-                  classes={{
-                    container: classes.listItem,
-                  }}
                 >
                   <ListItemText
                     disableTypography
@@ -144,7 +136,7 @@ const BuildList: FunctionComponent = () => {
                           </Typography>
                         </Grid>
                         <Grid item>
-                          <Grid container justify="space-between">
+                          <Grid container justifyContent="space-between">
                             <Grid item>
                               <Chip size="small" label={build.branchName} />
                             </Grid>
@@ -174,7 +166,7 @@ const BuildList: FunctionComponent = () => {
         </List>
       </Box>
       <Box height="9%">
-        <Grid container justify="center">
+        <Grid container justifyContent="center">
           <Grid item>
             <Pagination
               size="small"
diff --git a/src/components/DrawArea.tsx b/src/components/DrawArea.tsx
index 427cec5e..b212b9d4 100644
--- a/src/components/DrawArea.tsx
+++ b/src/components/DrawArea.tsx
@@ -128,7 +128,7 @@ export const DrawArea: FunctionComponent<IDrawArea> = ({
           container
           direction="column"
           alignItems="center"
-          justify="center"
+          justifyContent="center"
           className={classes.progressContainer}
         >
           <Grid item>
diff --git a/src/components/Header.tsx b/src/components/Header.tsx
index 290688e2..cc51bc3c 100644
--- a/src/components/Header.tsx
+++ b/src/components/Header.tsx
@@ -72,14 +72,18 @@ const Header: FunctionComponent = () => {
     <React.Fragment>
       <AppBar position="static" color="default">
         <Toolbar>
-          <Grid container justify="space-between" alignItems="center">
+          <Grid container justifyContent="space-between" alignItems="center">
             <Grid item>
               <Link to="/">
                 <img src={logo} width="60" height="60" alt="logo" />
               </Link>
             </Grid>
             <Grid item>
-              <Grid container justify="space-between" alignItems="center">
+              <Grid
+                container
+                justifyContent="space-between"
+                alignItems="center"
+              >
                 <GuidedTour />
                 {loggedIn && (
                   <IconButton
diff --git a/src/components/LoginForm.tsx b/src/components/LoginForm.tsx
index 3b7c7429..51fa1d94 100644
--- a/src/components/LoginForm.tsx
+++ b/src/components/LoginForm.tsx
@@ -77,7 +77,12 @@ const LoginForm = () => {
           </Grid>
         </CardContent>
         <CardActions>
-          <Grid container direction="column" justify="center" spacing={3}>
+          <Grid
+            container
+            direction="column"
+            justifyContent="center"
+            spacing={3}
+          >
             <Grid item>
               <Button
                 type="submit"
diff --git a/src/components/RegisterForm.tsx b/src/components/RegisterForm.tsx
index 05aff0d4..a28f69a9 100644
--- a/src/components/RegisterForm.tsx
+++ b/src/components/RegisterForm.tsx
@@ -122,7 +122,7 @@ const RegisterForm = () => {
           </Grid>
         </CardContent>
         <CardActions>
-          <Grid container justify="center">
+          <Grid container justifyContent="center">
             <Grid item>
               <Button
                 type="submit"
diff --git a/src/components/TestDetailsDialog/TestDetailsModal.tsx b/src/components/TestDetailsDialog/TestDetailsModal.tsx
index 9669fa0e..611bba7b 100644
--- a/src/components/TestDetailsDialog/TestDetailsModal.tsx
+++ b/src/components/TestDetailsDialog/TestDetailsModal.tsx
@@ -249,7 +249,7 @@ const TestDetailsModal: React.FunctionComponent<{
     <React.Fragment>
       <AppBar position="sticky">
         <Toolbar>
-          <Grid container justify="space-between">
+          <Grid container justifyContent="space-between">
             <Grid item>
               <Typography variant="h6">{testRun.name}</Typography>
             </Grid>
diff --git a/src/components/TestRunList/index.tsx b/src/components/TestRunList/index.tsx
index e35e3315..effa30aa 100644
--- a/src/components/TestRunList/index.tsx
+++ b/src/components/TestRunList/index.tsx
@@ -97,7 +97,7 @@ const columnsDef: GridColDef[] = [
 
 const TestRunList: React.FunctionComponent = () => {
   const { enqueueSnackbar } = useSnackbar();
-  const { testRuns, loading } = useTestRunState();
+  const { testRun, testRuns, loading } = useTestRunState();
   const { selectedBuildId } = useBuildState();
   const testRunDispatch = useTestRunDispatch();
 
@@ -148,14 +148,17 @@ const TestRunList: React.FunctionComponent = () => {
             );
           }}
           onStateChange={(props: GridStateChangeParams) => {
-            testRunDispatch({
-              type: "filter",
-              payload: props.state.visibleRows.visibleRows,
-            });
-            testRunDispatch({
-              type: "sort",
-              payload: props.state.sorting.sortedRows,
-            });
+            if (!testRun) {
+              // only if testRun modal is not shown
+              testRunDispatch({
+                type: "filter",
+                payload: props.state.visibleRows.visibleRows,
+              });
+              testRunDispatch({
+                type: "sort",
+                payload: props.state.sorting.sortedRows,
+              });
+            }
           }}
         />
       )}
diff --git a/src/contexts/testRun.context.tsx b/src/contexts/testRun.context.tsx
index fb2d1dbd..6f24e1ed 100644
--- a/src/contexts/testRun.context.tsx
+++ b/src/contexts/testRun.context.tsx
@@ -156,6 +156,9 @@ function testRunReducer(state: State, action: IAction): State {
           }
           return t;
         }),
+        testRun:
+          state.testRun &&
+          action.payload.find((item) => item.id === state.testRun!.id),
       };
     case "touched":
       return {
diff --git a/src/pages/LoginPage.tsx b/src/pages/LoginPage.tsx
index 0322aa30..836b9ebd 100644
--- a/src/pages/LoginPage.tsx
+++ b/src/pages/LoginPage.tsx
@@ -29,7 +29,7 @@ const LoginPage = () => {
       spacing={0}
       direction="column"
       alignItems="center"
-      justify="center"
+      justifyContent="center"
       style={{ minHeight: "60vh" }}
     >
       <Grid item>
diff --git a/src/pages/ProfilePage.tsx b/src/pages/ProfilePage.tsx
index 3aeeb85a..498a90fa 100644
--- a/src/pages/ProfilePage.tsx
+++ b/src/pages/ProfilePage.tsx
@@ -177,7 +177,7 @@ const ProfilePage = () => {
                     </Grid>
                   </CardContent>
                   <CardActions>
-                    <Grid container justify="center">
+                    <Grid container justifyContent="center">
                       <Grid item>
                         <Button
                           type="submit"
@@ -226,7 +226,7 @@ const ProfilePage = () => {
                     </Grid>
                   </CardContent>
                   <CardActions>
-                    <Grid container justify="center">
+                    <Grid container justifyContent="center">
                       <Grid item>
                         <Button
                           type="submit"
diff --git a/src/pages/RegisterPage.tsx b/src/pages/RegisterPage.tsx
index 7be0d5d8..1797be24 100644
--- a/src/pages/RegisterPage.tsx
+++ b/src/pages/RegisterPage.tsx
@@ -19,7 +19,7 @@ const RegisterPage = () => {
       spacing={0}
       direction="column"
       alignItems="center"
-      justify="center"
+      justifyContent="center"
       style={{ minHeight: "60vh" }}
     >
       <Grid item>