diff --git a/package-lock.json b/package-lock.json
index 7b32ad0..49fb772 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -383,9 +383,7 @@
             },
             "chownr": {
               "version": "1.1.1",
-              "bundled": true,
-              "dev": true,
-              "optional": true
+              "bundled": true
             },
             "code-point-at": {
               "version": "1.1.0",
@@ -441,8 +439,6 @@
             "fs-minipass": {
               "version": "1.2.5",
               "bundled": true,
-              "dev": true,
-              "optional": true,
               "requires": {
                 "minipass": "^2.2.1"
               }
@@ -562,7 +558,6 @@
             "minipass": {
               "version": "2.3.5",
               "bundled": true,
-              "dev": true,
               "optional": true,
               "requires": {
                 "safe-buffer": "^5.1.2",
@@ -572,8 +567,6 @@
             "minizlib": {
               "version": "1.2.1",
               "bundled": true,
-              "dev": true,
-              "optional": true,
               "requires": {
                 "minipass": "^2.2.1"
               }
@@ -762,7 +755,6 @@
             "safe-buffer": {
               "version": "5.1.2",
               "bundled": true,
-              "dev": true,
               "optional": true
             },
             "safer-buffer": {
@@ -830,21 +822,6 @@
               "dev": true,
               "optional": true
             },
-            "tar": {
-              "version": "4.4.8",
-              "bundled": true,
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "chownr": "^1.1.1",
-                "fs-minipass": "^1.2.5",
-                "minipass": "^2.3.4",
-                "minizlib": "^1.1.1",
-                "mkdirp": "^0.5.0",
-                "safe-buffer": "^5.1.2",
-                "yallist": "^3.0.2"
-              }
-            },
             "util-deprecate": {
               "version": "1.0.2",
               "bundled": true,
@@ -869,7 +846,6 @@
             "yallist": {
               "version": "3.0.3",
               "bundled": true,
-              "dev": true,
               "optional": true
             }
           }
@@ -4144,76 +4120,32 @@
       "version": "github:angular/flex-layout#dd367816157ea7a98dd1e9a9050f89b87d97639f",
       "from": "github:angular/flex-layout",
       "requires": {
-        "@angular/cdk": "^9.2.2",
-        "@angular/common": "^9.1.5",
-        "@angular/compiler": "^9.1.5",
-        "@angular/core": "^9.1.5",
-        "@angular/platform-browser": "^9.1.5",
+        "@angular/cdk": "^8.0.0-rc.1",
+        "@angular/common": "^8.0.0-rc.5",
+        "@angular/compiler": "^8.0.0-rc.5",
+        "@angular/core": "^8.0.0-rc.5",
+        "@angular/platform-browser": "^8.0.0-rc.5",
         "core-js": "^2.5.7",
         "karma-parallel": "^0.3.1",
         "rxjs": "^6.5.1",
         "systemjs": "0.19.43",
-        "tsickle": "^0.37.1",
+        "tsickle": "^0.35.0",
         "tslib": "^1.9.3",
-        "zone.js": "~0.10.2"
+        "zone.js": "~0.9.1"
       },
       "dependencies": {
-        "@angular/cdk": {
-          "version": "9.2.3",
-          "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-9.2.3.tgz",
-          "integrity": "sha512-tQr/yt8GNGsZ/DTT+PMq7XdRmL56hwVCyf8F12JQAawutSLfTfMb+S1lpN7L/0Pb/L5JBuCfG2HmXK7vHo02gw==",
-          "requires": {
-            "parse5": "^5.0.0"
-          }
-        },
-        "@angular/common": {
-          "version": "9.1.6",
-          "resolved": "https://registry.npmjs.org/@angular/common/-/common-9.1.6.tgz",
-          "integrity": "sha512-L9vw//wE+8QcSArOA411uJ68znnszCiPrbzSBV0BRZeadc7X68MwANA9qjtiTWZx5Xh9pNfHHwsCUyv2lUeinQ=="
-        },
-        "@angular/compiler": {
-          "version": "9.1.6",
-          "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-9.1.6.tgz",
-          "integrity": "sha512-tHOQEjWuWqSkrk6/vI6BK7uJnpAyFajCXPW37rH5xspF/aMbetrpoOiGBNUQg/HLaFh04nOAnnFntjLkW0ooaA=="
-        },
-        "@angular/core": {
-          "version": "9.1.6",
-          "resolved": "https://registry.npmjs.org/@angular/core/-/core-9.1.6.tgz",
-          "integrity": "sha512-iXgPh5DebLwkMzLtQ6WKiv/mo4hpwMOwYex3O4F2CKToR2tKPnXbV5WC/ADGm0XYXiocSKQPiyL4ZrUjVeKEqA=="
-        },
-        "@angular/platform-browser": {
-          "version": "9.1.6",
-          "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-9.1.6.tgz",
-          "integrity": "sha512-ebQhbT0Z55vwlQwAY4+s3Bcf1Q4wEN5Yk43iCuVt4g2kFkg09UP0z8aYtbuh7VQDyv/W4TTIGX8smGBWstoedQ=="
-        },
         "core-js": {
-          "version": "2.6.10",
-          "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.10.tgz",
-          "integrity": "sha512-I39t74+4t+zau64EN1fE5v2W31Adtc/REhzWN+gWRRXg6WH5qAsZm62DHpQ1+Yhe4047T55jvzz7MUqF/dBBlA=="
-        },
-        "parse5": {
-          "version": "5.1.1",
-          "resolved": "https://registry.npmjs.org/parse5/-/parse5-5.1.1.tgz",
-          "integrity": "sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug==",
-          "optional": true
+          "version": "2.6.12",
+          "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz",
+          "integrity": "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ=="
         },
         "rxjs": {
-          "version": "6.5.3",
-          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.3.tgz",
-          "integrity": "sha512-wuYsAYYFdWTAnAaPoKGNhfpWwKZbJW+HgAJ+mImp+Epl7BG8oNWBCTyRM8gba9k4lk8BgWdoYm21Mo/RYhhbgA==",
+          "version": "6.6.7",
+          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",
+          "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==",
           "requires": {
             "tslib": "^1.9.0"
           }
-        },
-        "tsickle": {
-          "version": "0.37.1",
-          "resolved": "https://registry.npmjs.org/tsickle/-/tsickle-0.37.1.tgz",
-          "integrity": "sha512-0GwgOJEnsmRsrONXCvcbAWY0CvdqF3UugPVoupUpA8Ul0qCPTuqqq0ou/hLqtKZOyyulzCP6MYRjb9/J1g9bJg=="
-        },
-        "zone.js": {
-          "version": "0.10.3",
-          "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.10.3.tgz",
-          "integrity": "sha512-LXVLVEq0NNOqK/fLJo3d0kfzd4sxwn2/h67/02pjCjfKDxgx1i9QqpvtHD8CrBnSSwMw5+dy11O7FRX5mkO7Cg=="
         }
       }
     },
@@ -5893,9 +5825,7 @@
             },
             "chownr": {
               "version": "1.1.1",
-              "bundled": true,
-              "dev": true,
-              "optional": true
+              "bundled": true
             },
             "code-point-at": {
               "version": "1.1.0",
@@ -5951,8 +5881,6 @@
             "fs-minipass": {
               "version": "1.2.5",
               "bundled": true,
-              "dev": true,
-              "optional": true,
               "requires": {
                 "minipass": "^2.2.1"
               }
@@ -6072,7 +6000,6 @@
             "minipass": {
               "version": "2.3.5",
               "bundled": true,
-              "dev": true,
               "optional": true,
               "requires": {
                 "safe-buffer": "^5.1.2",
@@ -6082,8 +6009,6 @@
             "minizlib": {
               "version": "1.2.1",
               "bundled": true,
-              "dev": true,
-              "optional": true,
               "requires": {
                 "minipass": "^2.2.1"
               }
@@ -6272,7 +6197,6 @@
             "safe-buffer": {
               "version": "5.1.2",
               "bundled": true,
-              "dev": true,
               "optional": true
             },
             "safer-buffer": {
@@ -6340,21 +6264,6 @@
               "dev": true,
               "optional": true
             },
-            "tar": {
-              "version": "4.4.8",
-              "bundled": true,
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "chownr": "^1.1.1",
-                "fs-minipass": "^1.2.5",
-                "minipass": "^2.3.4",
-                "minizlib": "^1.1.1",
-                "mkdirp": "^0.5.0",
-                "safe-buffer": "^5.1.2",
-                "yallist": "^3.0.2"
-              }
-            },
             "util-deprecate": {
               "version": "1.0.2",
               "bundled": true,
@@ -6379,7 +6288,6 @@
             "yallist": {
               "version": "3.0.3",
               "bundled": true,
-              "dev": true,
               "optional": true
             }
           }
@@ -7040,8 +6948,7 @@
     "minimist": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-      "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
-      "dev": true
+      "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
     },
     "minipass": {
       "version": "2.9.0",
@@ -9526,8 +9433,7 @@
     "source-map": {
       "version": "0.7.3",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
-      "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
-      "dev": true
+      "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ=="
     },
     "source-map-loader": {
       "version": "0.2.4",
@@ -10011,18 +9917,47 @@
       "dev": true
     },
     "tar": {
-      "version": "4.4.13",
-      "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.13.tgz",
-      "integrity": "sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA==",
-      "dev": true,
-      "requires": {
-        "chownr": "^1.1.1",
-        "fs-minipass": "^1.2.5",
-        "minipass": "^2.8.6",
-        "minizlib": "^1.2.1",
-        "mkdirp": "^0.5.0",
-        "safe-buffer": "^5.1.2",
-        "yallist": "^3.0.3"
+      "version": "4.4.19",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.19.tgz",
+      "integrity": "sha512-a20gEsvHnWe0ygBY8JbxoM4w3SJdhc7ZAuxkLqh+nvNQN2IOt0B5lLgM490X5Hl8FF0dl0tOf2ewFYAlIFgzVA==",
+      "dev": true,
+      "requires": {
+        "chownr": "^1.1.4",
+        "fs-minipass": "^1.2.7",
+        "minipass": "^2.9.0",
+        "minizlib": "^1.3.3",
+        "mkdirp": "^0.5.5",
+        "safe-buffer": "^5.2.1",
+        "yallist": "^3.1.1"
+      },
+      "dependencies": {
+        "chownr": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
+          "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==",
+          "dev": true
+        },
+        "minimist": {
+          "version": "1.2.5",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+          "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
+          "dev": true
+        },
+        "mkdirp": {
+          "version": "0.5.5",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
+          "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
+          "dev": true,
+          "requires": {
+            "minimist": "^1.2.5"
+          }
+        },
+        "safe-buffer": {
+          "version": "5.2.1",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+          "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+          "dev": true
+        }
       }
     },
     "terser": {
@@ -10221,6 +10156,16 @@
         "yn": "^2.0.0"
       }
     },
+    "tsickle": {
+      "version": "0.35.0",
+      "resolved": "https://registry.npmjs.org/tsickle/-/tsickle-0.35.0.tgz",
+      "integrity": "sha512-irsZLX4293YUl9TuwNC5Fy020eLSc4bC3LfKnxnx1oq5wmZD9zSP8qvNNTiwRmf2/rxH+58JINcTARDjuvn+oQ==",
+      "requires": {
+        "minimist": "^1.2.0",
+        "mkdirp": "^0.5.1",
+        "source-map": "^0.7.3"
+      }
+    },
     "tslib": {
       "version": "1.10.0",
       "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.10.0.tgz",
@@ -10799,9 +10744,7 @@
             },
             "chownr": {
               "version": "1.1.1",
-              "bundled": true,
-              "dev": true,
-              "optional": true
+              "bundled": true
             },
             "code-point-at": {
               "version": "1.1.0",
@@ -10857,8 +10800,6 @@
             "fs-minipass": {
               "version": "1.2.5",
               "bundled": true,
-              "dev": true,
-              "optional": true,
               "requires": {
                 "minipass": "^2.2.1"
               }
@@ -10978,7 +10919,6 @@
             "minipass": {
               "version": "2.3.5",
               "bundled": true,
-              "dev": true,
               "optional": true,
               "requires": {
                 "safe-buffer": "^5.1.2",
@@ -10988,8 +10928,6 @@
             "minizlib": {
               "version": "1.2.1",
               "bundled": true,
-              "dev": true,
-              "optional": true,
               "requires": {
                 "minipass": "^2.2.1"
               }
@@ -11178,7 +11116,6 @@
             "safe-buffer": {
               "version": "5.1.2",
               "bundled": true,
-              "dev": true,
               "optional": true
             },
             "safer-buffer": {
@@ -11246,21 +11183,6 @@
               "dev": true,
               "optional": true
             },
-            "tar": {
-              "version": "4.4.8",
-              "bundled": true,
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "chownr": "^1.1.1",
-                "fs-minipass": "^1.2.5",
-                "minipass": "^2.3.4",
-                "minizlib": "^1.1.1",
-                "mkdirp": "^0.5.0",
-                "safe-buffer": "^5.1.2",
-                "yallist": "^3.0.2"
-              }
-            },
             "util-deprecate": {
               "version": "1.0.2",
               "bundled": true,
@@ -11285,7 +11207,6 @@
             "yallist": {
               "version": "3.0.3",
               "bundled": true,
-              "dev": true,
               "optional": true
             }
           }
@@ -11628,9 +11549,7 @@
             },
             "chownr": {
               "version": "1.1.1",
-              "bundled": true,
-              "dev": true,
-              "optional": true
+              "bundled": true
             },
             "code-point-at": {
               "version": "1.1.0",
@@ -11686,8 +11605,6 @@
             "fs-minipass": {
               "version": "1.2.5",
               "bundled": true,
-              "dev": true,
-              "optional": true,
               "requires": {
                 "minipass": "^2.2.1"
               }
@@ -11807,7 +11724,6 @@
             "minipass": {
               "version": "2.3.5",
               "bundled": true,
-              "dev": true,
               "optional": true,
               "requires": {
                 "safe-buffer": "^5.1.2",
@@ -11817,8 +11733,6 @@
             "minizlib": {
               "version": "1.2.1",
               "bundled": true,
-              "dev": true,
-              "optional": true,
               "requires": {
                 "minipass": "^2.2.1"
               }
@@ -12007,7 +11921,6 @@
             "safe-buffer": {
               "version": "5.1.2",
               "bundled": true,
-              "dev": true,
               "optional": true
             },
             "safer-buffer": {
@@ -12075,21 +11988,6 @@
               "dev": true,
               "optional": true
             },
-            "tar": {
-              "version": "4.4.8",
-              "bundled": true,
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "chownr": "^1.1.1",
-                "fs-minipass": "^1.2.5",
-                "minipass": "^2.3.4",
-                "minizlib": "^1.1.1",
-                "mkdirp": "^0.5.0",
-                "safe-buffer": "^5.1.2",
-                "yallist": "^3.0.2"
-              }
-            },
             "util-deprecate": {
               "version": "1.0.2",
               "bundled": true,
@@ -12114,7 +12012,6 @@
             "yallist": {
               "version": "3.0.3",
               "bundled": true,
-              "dev": true,
               "optional": true
             }
           }