diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 16dd8264dae..b426934548f 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,14 +1,6 @@
 # How to Contribute
 
-This document outlines some of the conventions on
-development workflow, commit message formatting, contact points and other
-resources to make it easier to get your contribution accepted.
-
-# Email and Chat
-
-The project currently uses the general Tectonic Team email list and Slack channel:
-- Email: team-tectonic@coreos.com
-- Slack: #team-tectonic
+This document outlines some of the conventions on development workflow.
 
 ## Getting Started
 
@@ -35,25 +27,52 @@ questions: what changed and why. The subject line should feature the what and
 the body of the commit should describe the why.
 
 ```
-scripts: add the test-cluster command
+Add the test-cluster command
 
-this uses tmux to setup a test cluster that you can easily kill and
+This uses tmux to setup a test cluster that you can easily kill and
 start for debugging.
+```
+
+Commits that fix a Bugzilla bug should add the bug number like `Bug 12345: ` to
+the first line of the commit and to the pull request title. To help others
+quickly go to the bug, also add a link to the bug in the body of the commit
+message. This allows automated tooling to generate links to bugs in release
+notes and will eventually allow us to automatically transition bugs to `ON_QA`
+when the fix is available in a nightly build. Here's an example commit message
+for a change that fixes a Bugzilla bug:
+
+```
+Bug 1679272: Validate console can talk to OAuth token URL
+
+Make sure we can successfully talk to the OAuth token URL after
+discovering metadata before marking the console pod as ready.
 
-Fixes #38
+Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1679272
+```
+
+Pull requests that close GitHub issues should add text to the pull request
+description in the format `Closes #123`. GitHub will automatically link each
+issue to its pull request and close the issue when the pull request merges.
+
+While we don't have automated tooling for JIRA issues, you should still include
+a link to the issue in the commit description to make it easy to get to the issue.
+
+### Pull Requests Against Other Branches
+
+Pull requests opened against branches other than master should start the pull
+request title with the branch name in brackets like `[release-3.11]` to make it
+obvious. Include the bug as well when appropriate. For instance,
+
+```
+[release-3.11] Bug 1643948: Fix crashlooping pods query
 ```
 
-The format can be described more formally as follows:
+If you use the `/cherrypick` command, the bot will automatically append the
+branch to the pull request title. For instance, adding a comment to a PR like
 
 ```
-<subsystem>: <what changed>
-<BLANK LINE>
-<why this change was made>
-<BLANK LINE>
-<footer>
+/cherrypick release-3.11
 ```
 
-The first line is the subject and should be no longer than 70 characters, the
-second line is always blank, and other lines should be wrapped at 80 characters.
-This allows the message to be easier to read on GitHub as well as in various
-git tools.
+will create a new pull request against the release-3.11 branch when the current
+pull request merges as long as there are no merge conflicts.
diff --git a/OWNERS b/OWNERS
new file mode 100644
index 00000000000..e72962cbfc8
--- /dev/null
+++ b/OWNERS
@@ -0,0 +1,11 @@
+reviewers:
+  - alecmerdler
+  - benjaminapetersen
+  - jhadvig
+  - rhamilto
+  - spadgett
+approvers:
+  - benjaminapetersen
+  - bparees
+  - rhamilto
+  - spadgett
diff --git a/README.md b/README.md
index 4086fbc73fe..d212dfd18dd 100644
--- a/README.md
+++ b/README.md
@@ -3,8 +3,6 @@ OpenShift Console
 
 Codename: "Bridge"
 
-[![Build Status](https://jenkins-tectonic.prod.coreos.systems/buildStatus/icon?job=console-build)](https://jenkins-tectonic.prod.coreos.systems/job/console-build/)
-
 [quay.io/openshift/origin-console](https://quay.io/repository/openshift/origin-console?tab=tags)
 
 The console is a more friendly `kubectl` in the form of a single page webapp.  It also integrates with other services like monitoring, chargeback, and OLM.  Some things that go on behind the scenes include:
@@ -35,22 +33,53 @@ Backend binaries are output to `/bin`.
 
 ### Configure the application
 
-#### OpenShift
+The following instructions assume you have an existing cluster you can connect
+to. OpenShift 4.0 clusters can be installed using the
+[OpenShift Installer](https://github.com/openshift/installer).
+You can also use [CodeReady Containers](https://github.com/code-ready/osp4)
+for local installs. More information about installing OpenShift can be found at
+<https://try.openshift.com/>.
+
+
+#### OpenShift (no authentication)
 
-Registering an OpenShift OAuth client requires administrative privileges for the entire cluster, not just a local project. Run the following command to log in as cluster admin:
+For local development, you can disable OAuth and run bridge with an OpenShift
+user's access token. If you've installed OpenShift 4.0, run the following
+commands to login as the kubeadmin user and start a local console for
+development. Make sure to replace `/path/to/install-dir` with the directory you
+used to install OpenShift.
 
 ```
-oc login -u system:admin
+oc login -u kubeadmin -p $(cat /path/to/install-dir/auth/kubeadmin-password)
+source ./contrib/oc-environment.sh
+./bin/bridge
 ```
 
-To run bridge locally connected to an OpenShift cluster, create an `OAuthClient` resource with a generated secret and read that secret:
+The console will be running at [localhost:9000](http://localhost:9000).
+
+If you don't have `kubeadmin` access, you can use any user's API token,
+although you will be limited to that user's access and might not be able to run
+the full integration test suite.
+
+#### OpenShift (with authentication)
+
+If you need to work on the backend code for authentication or you need to test
+different users, you can set up authentication in your development environment.
+Registering an OpenShift OAuth client requires administrative privileges for
+the entire cluster, not just a local project. You must be logged in as a
+cluster admin such as `system:admin` or `kubeadmin`.
+
+To run bridge locally connected to an OpenShift cluster, create an
+`OAuthClient` resource with a generated secret and read that secret:
 
 ```
 oc process -f examples/console-oauth-client.yaml | oc apply -f -
 oc get oauthclient console-oauth-client -o jsonpath='{.secret}' > examples/console-client-secret
 ```
 
-If the CA bundle of the OpenShift API server is unavailable, fetch the CA certificates from a service account secret. Otherwise copy the CA bundle to `examples/ca.crt`:
+If the CA bundle of the OpenShift API server is unavailable, fetch the CA
+certificates from a service account secret. Otherwise copy the CA bundle to
+`examples/ca.crt`:
 
 ```
 oc get secrets -n default --field-selector type=kubernetes.io/service-account-token -o json | \
@@ -58,32 +87,12 @@ oc get secrets -n default --field-selector type=kubernetes.io/service-account-to
 # Note: use "openssl base64" because the "base64" tool is different between mac and linux
 ```
 
-Set the `OPENSHIFT_API` environment variable to tell the script the API endpoint:
-
-```
-export OPENSHIFT_API="https://127.0.0.1:8443"
-```
-
 Finally run the console and visit [localhost:9000](http://localhost:9000):
 
 ```
 ./examples/run-bridge.sh
 ```
 
-#### OpenShift (without OAuth)
-
-For local development, you can also disable OAuth and run bridge with an
-OpenShift user's access token. Run the following commands to create an admin
-user and start bridge for a cluster up environment:
-
-```
-oc login -u system:admin
-oc adm policy add-cluster-role-to-user cluster-admin admin
-oc login -u admin
-source ./contrib/oc-environment.sh
-./bin/bridge
-```
-
 #### Native Kubernetes
 
 If you have a working `kubectl` on your path, you can run the application with:
@@ -110,32 +119,10 @@ kubectl describe secrets/<secret-id-obtained-previously>
 
 Use this token value to set the `BRIDGE_K8S_BEARER_TOKEN` environment variable when running Bridge.
 
-## Images
+## Operator
 
-The `builder-run.sh` script will run any command from a docker container to ensure a consistent build environment.
-For example to build with docker run:
-```
-./builder-run.sh ./build.sh
-```
-
-The docker image used by builder-run is itself built and pushed by the
-script `push-builder`, which uses the file `Dockerfile-builder` to
-define an image. To update the builder-run build environment, first make
-your changes to `Dockerfile-builder`, then run `push-builder`, and
-then update the BUILDER_VERSION variable in `builder-run` to point to
-your new image. Our practice is to manually tag images builder images in the form
-`Builder-v$SEMVER` once we're happy with the state of the push.
-
-### Compile, Build, & Push Image
-
-(Almost no reason to ever do this manually, Jenkins handles this automation)
-
-Build an image, tag it with the current git sha, and pushes it to the `quay.io/coreos/tectonic-console` repo.
-
-Must set env vars `DOCKER_USER` and `DOCKER_PASSWORD` or have a valid `.dockercfg` file.
-```
-./build-docker-push.sh
-```
+In OpenShift 4.x, the console is installed and managed by the
+[console operator](https://github.com/openshift/console-operator/).
 
 ## Hacking
 
@@ -206,12 +193,34 @@ Run integration tests on an OpenShift cluster:
 yarn run test-gui-openshift
 ```
 This will include the normal k8s CRUD tests and CRUD tests for OpenShift
-resources. It doesn't include ALM tests since it assumes ALM is not
-set up on an OpenShift cluster.
+resources.
+
+#### How the Integration Tests Run in CI
+
+The end-to-end tests run against pull requests using [ci-operator](https://github.com/openshift/ci-operator/).
+The tests are defined in [this manifest](https://github.com/openshift/release/blob/master/ci-operator/jobs/openshift/console/openshift-console-master-presubmits.yaml)
+in the [openshift/release](https://github.com/openshift/release) repo and were generated with [ci-operator-prowgen](https://github.com/openshift/ci-operator-prowgen).
+
+CI runs the [test-prow-e2e.sh](test-prow-e2e.sh) script, which uses the `e2e` suite defined in [protractor.conf.ts](frontend/integration-tests/protractor.conf.ts).
+
+You can simulate an e2e run against an existing 4.0 cluster with the following commands (replace `/path/to/install-dir` with your OpenShift 4.0 install directory):
+
+```
+$ export BRIDGE_AUTH_USERNAME=kubeadmin
+$ export BRIDGE_BASE_ADDRESS="https://$(oc get route console -n openshift-console -o jsonpath='{.spec.host}')"
+$ export BRIDGE_AUTH_PASSWORD=$(cat "/path/to/install-dir/auth/kubeadmin-password")
+$ ./test-gui.sh e2e
+```
+
+If you don't want to run the entire e2e tests, you can use a different suite from [protractor.conf.ts](frontend/integration-tests/protractor.conf.ts). For instance,
+
+```
+$ ./test-gui.sh olm
+```
 
 #### Hacking Integration Tests
 
-Remove the `--headless` flag to Chrome (chromeOptions) in `frontend/integration-tests/protractor.conf.ts` to see what the tests are actually doing.
+Remove the `--headless` flag to Chrome (chromeOptions) in [protractor.conf.ts](frontend/integration-tests/protractor.conf.ts) to see what the tests are actually doing.
 
 ### Dependency Management
 
@@ -245,7 +254,6 @@ Update existing frontend dependencies:
 yarn upgrade <package@version>
 ```
 
-
 #### Supported Browsers
 
 We support the latest versions of the following browsers:
diff --git a/auth/OWNERS b/auth/OWNERS
new file mode 100644
index 00000000000..b88042d3b53
--- /dev/null
+++ b/auth/OWNERS
@@ -0,0 +1,9 @@
+reviewers:
+  - benjaminapetersen
+  - enj
+  - spadgett
+approvers:
+  - benjaminapetersen
+  - bparees
+  - enj
+  - spadgett
diff --git a/auth/auth.go b/auth/auth.go
index 3e74aee9ec1..f8a67e880d3 100644
--- a/auth/auth.go
+++ b/auth/auth.go
@@ -44,17 +44,15 @@ var log = capnslog.NewPackageLogger("github.com/openshift/console", "auth")
 type Authenticator struct {
 	tokenVerifier func(string) (*loginState, error)
 
-	oauth2Client *oauth2.Config
+	authFunc func() (*oauth2.Config, loginMethod)
 
-	client *http.Client
+	clientFunc func() *http.Client
 
 	errorURL      string
 	successURL    string
 	cookiePath    string
 	refererURL    *url.URL
 	secureCookies bool
-
-	loginMethod loginMethod
 }
 
 // loginMethod is used to handle OAuth2 responses and associate bearer tokens
@@ -140,50 +138,51 @@ func newHTTPClient(issuerCA string, includeSystemRoots bool) (*http.Client, erro
 // NewAuthenticator initializes an Authenticator struct. It blocks until the authenticator is
 // able to contact the provider.
 func NewAuthenticator(ctx context.Context, c *Config) (*Authenticator, error) {
-	// Retry connecting to the identity provider a few times
-	backoff := time.Second * 2
-	maxSteps := 7
+	// Retry connecting to the identity provider every 10s for 5 minutes
+	const (
+		backoff  = time.Second * 10
+		maxSteps = 30
+	)
 	steps := 0
 
 	for {
-		var (
-			a        *Authenticator
-			lm       loginMethod
-			endpoint oauth2.Endpoint
-			err      error
-		)
-
-		a, err = newUnstartedAuthenticator(c)
+		a, err := newUnstartedAuthenticator(c)
 		if err != nil {
 			return nil, err
 		}
 
+		var authSourceFunc func() (oauth2.Endpoint, loginMethod, error)
 		switch c.AuthSource {
 		case AuthSourceOpenShift:
-			// Use the k8s CA for OAuth metadata discovery.
-			var k8sClient *http.Client
-			// Don't include system roots when talking to the API server.
-			k8sClient, err = newHTTPClient(c.K8sCA, false)
-			if err != nil {
-				return nil, err
+			authSourceFunc = func() (oauth2.Endpoint, loginMethod, error) {
+				// Use the k8s CA for OAuth metadata discovery.
+				// Don't include system roots when talking to the API server.
+				k8sClient, errK8Client := newHTTPClient(c.K8sCA, false)
+				if errK8Client != nil {
+					return oauth2.Endpoint{}, nil, errK8Client
+				}
+
+				return newOpenShiftAuth(ctx, &openShiftConfig{
+					k8sClient:     k8sClient,
+					oauthClient:   a.clientFunc(),
+					issuerURL:     c.IssuerURL,
+					cookiePath:    c.CookiePath,
+					secureCookies: c.SecureCookies,
+				})
 			}
-
-			endpoint, lm, err = newOpenShiftAuth(ctx, &openShiftConfig{
-				k8sClient:     k8sClient,
-				oauthClient:   a.client,
-				issuerURL:     c.IssuerURL,
-				cookiePath:    c.CookiePath,
-				secureCookies: c.SecureCookies,
-			})
 		default:
-			endpoint, lm, err = newOIDCAuth(ctx, &oidcConfig{
-				client:        a.client,
-				issuerURL:     c.IssuerURL,
-				clientID:      c.ClientID,
-				cookiePath:    c.CookiePath,
-				secureCookies: c.SecureCookies,
-			})
+			authSourceFunc = func() (oauth2.Endpoint, loginMethod, error) {
+				return newOIDCAuth(ctx, &oidcConfig{
+					client:        a.clientFunc(),
+					issuerURL:     c.IssuerURL,
+					clientID:      c.ClientID,
+					cookiePath:    c.CookiePath,
+					secureCookies: c.SecureCookies,
+				})
+			}
 		}
+
+		fallbackEndpoint, fallbackLoginMethod, err := authSourceFunc()
 		if err != nil {
 			steps++
 			if steps > maxSteps {
@@ -194,27 +193,47 @@ func NewAuthenticator(ctx context.Context, c *Config) (*Authenticator, error) {
 			log.Errorf("error contacting auth provider (retrying in %s): %v", backoff, err)
 
 			time.Sleep(backoff)
-			backoff *= 2
 			continue
 		}
 
-		a.loginMethod = lm
-		a.oauth2Client.Endpoint = endpoint
+		a.authFunc = func() (*oauth2.Config, loginMethod) {
+			// rebuild non-pointer struct each time to prevent any mutation
+			baseOAuth2Config := oauth2.Config{
+				ClientID:     c.ClientID,
+				ClientSecret: c.ClientSecret,
+				RedirectURL:  c.RedirectURL,
+				Scopes:       c.Scope,
+				Endpoint:     fallbackEndpoint,
+			}
+
+			currentEndpoint, currentLoginMethod, errAuthSource := authSourceFunc()
+			if errAuthSource != nil {
+				log.Errorf("failed to get latest auth source data: %v", errAuthSource)
+				return &baseOAuth2Config, fallbackLoginMethod
+			}
+
+			baseOAuth2Config.Endpoint = currentEndpoint
+			return &baseOAuth2Config, currentLoginMethod
+		}
+
 		return a, nil
 	}
 }
 
 func newUnstartedAuthenticator(c *Config) (*Authenticator, error) {
-	client, err := newHTTPClient(c.IssuerCA, true)
+	// make sure we get a valid starting client
+	fallbackClient, err := newHTTPClient(c.IssuerCA, true)
 	if err != nil {
 		return nil, err
 	}
 
-	oauth2Client := &oauth2.Config{
-		ClientID:     c.ClientID,
-		ClientSecret: c.ClientSecret,
-		RedirectURL:  c.RedirectURL,
-		Scopes:       c.Scope,
+	clientFunc := func() *http.Client {
+		currentClient, err := newHTTPClient(c.IssuerCA, true)
+		if err != nil {
+			log.Errorf("failed to get latest http client: %v", err)
+			return fallbackClient
+		}
+		return currentClient
 	}
 
 	errURL := "/"
@@ -237,8 +256,7 @@ func newUnstartedAuthenticator(c *Config) (*Authenticator, error) {
 	}
 
 	return &Authenticator{
-		oauth2Client:  oauth2Client,
-		client:        client,
+		clientFunc:    clientFunc,
 		errorURL:      errURL,
 		successURL:    sucURL,
 		cookiePath:    c.CookiePath,
@@ -255,7 +273,7 @@ type User struct {
 }
 
 func (a *Authenticator) Authenticate(r *http.Request) (*User, error) {
-	return a.loginMethod.authenticate(r)
+	return a.getLoginMethod().authenticate(r)
 }
 
 // LoginFunc redirects to the OIDC provider for user login.
@@ -273,29 +291,17 @@ func (a *Authenticator) LoginFunc(w http.ResponseWriter, r *http.Request) {
 		Secure:   a.secureCookies,
 	}
 	http.SetCookie(w, &cookie)
-	http.Redirect(w, r, a.oauth2Client.AuthCodeURL(state), http.StatusSeeOther)
+	http.Redirect(w, r, a.getOAuth2Config().AuthCodeURL(state), http.StatusSeeOther)
 }
 
 // LogoutFunc cleans up session cookies.
 func (a *Authenticator) LogoutFunc(w http.ResponseWriter, r *http.Request) {
-	a.loginMethod.logout(w, r)
+	a.getLoginMethod().logout(w, r)
 }
 
 // GetKubeAdminLogoutURL returns the logout URL for the special kube:admin user in OpenShift
 func (a *Authenticator) GetKubeAdminLogoutURL() string {
-	return a.loginMethod.getKubeAdminLogoutURL()
-}
-
-// ExchangeAuthCode allows callers to return a raw token response given a OAuth2
-// code. This is useful for clients which need to request refresh tokens.
-func (a *Authenticator) ExchangeAuthCode(code string) (idToken, refreshToken string, err error) {
-	ctx := oidc.ClientContext(context.TODO(), a.client)
-	token, err := a.oauth2Client.Exchange(ctx, code)
-	if err != nil {
-		return "", "", fmt.Errorf("request token: %v", err)
-	}
-	rawIDToken, _ := token.Extra("id_token").(string)
-	return rawIDToken, token.RefreshToken, nil
+	return a.getLoginMethod().getKubeAdminLogoutURL()
 }
 
 // CallbackFunc handles OAuth2 callbacks and code/token exchange.
@@ -331,15 +337,16 @@ func (a *Authenticator) CallbackFunc(fn func(loginInfo LoginJSON, successURL str
 			a.redirectAuthError(w, errorInvalidState, nil)
 			return
 		}
-		ctx := oidc.ClientContext(context.TODO(), a.client)
-		token, err := a.oauth2Client.Exchange(ctx, code)
+		ctx := oidc.ClientContext(context.TODO(), a.clientFunc())
+		oauthConfig, lm := a.authFunc()
+		token, err := oauthConfig.Exchange(ctx, code)
 		if err != nil {
 			log.Infof("unable to verify auth code with issuer: %v", err)
 			a.redirectAuthError(w, errorInvalidCode, err)
 			return
 		}
 
-		ls, err := a.loginMethod.login(w, token)
+		ls, err := lm.login(w, token)
 		if err != nil {
 			log.Errorf("error constructing login state: %v", err)
 			a.redirectAuthError(w, errorInternal, nil)
@@ -351,6 +358,16 @@ func (a *Authenticator) CallbackFunc(fn func(loginInfo LoginJSON, successURL str
 	}
 }
 
+func (a *Authenticator) getOAuth2Config() *oauth2.Config {
+	oauthConfig, _ := a.authFunc()
+	return oauthConfig
+}
+
+func (a *Authenticator) getLoginMethod() loginMethod {
+	_, lm := a.authFunc()
+	return lm
+}
+
 func (a *Authenticator) redirectAuthError(w http.ResponseWriter, authErr string, err error) {
 	var u url.URL
 	up, err := url.Parse(a.errorURL)
diff --git a/cmd/bridge/main.go b/cmd/bridge/main.go
index 9c3bb4d86a8..2e316ce359e 100644
--- a/cmd/bridge/main.go
+++ b/cmd/bridge/main.go
@@ -83,7 +83,7 @@ func main() {
 	fK8sPublicEndpoint := fs.String("k8s-public-endpoint", "", "Endpoint to use when rendering kubeconfigs for clients. Useful for when bridge uses an internal endpoint clients can't access for communicating with the API server.")
 
 	fDexAPIHost := fs.String("dex-api-host", "", "Target host and port of the Dex API service.")
-	fBranding := fs.String("branding", "okd", "Console branding for the masthead logo and title. One of okd, openshift, ocp, online, or dedicated. Defaults to okd.")
+	fBranding := fs.String("branding", "okd", "Console branding for the masthead logo and title. One of okd, openshift, ocp, online, dedicated, or azure. Defaults to okd.")
 	fDocumentationBaseURL := fs.String("documentation-base-url", "", "The base URL for documentation links.")
 	fGoogleTagManagerID := fs.String("google-tag-manager-id", "", "Google Tag Manager ID. External analytics are disabled if this is not set.")
 
@@ -147,8 +147,9 @@ func main() {
 	case "ocp":
 	case "online":
 	case "dedicated":
+	case "azure":
 	default:
-		flagFatalf("branding", "value must be one of okd, openshift, ocp, or online")
+		flagFatalf("branding", "value must be one of okd, openshift, ocp, online, dedicated, or azure")
 	}
 
 	srv := &server.Server{
diff --git a/examples/run-bridge.sh b/examples/run-bridge.sh
index f3dafbd4d8d..4bd0dad2161 100755
--- a/examples/run-bridge.sh
+++ b/examples/run-bridge.sh
@@ -1,11 +1,13 @@
-#!/bin/bash -e
+#!/usr/bin/env bash
+
+set -exuo pipefail
 
 ./bin/bridge \
     --base-address=http://localhost:9000 \
     --ca-file=examples/ca.crt \
     --k8s-auth=openshift \
     --k8s-mode=off-cluster \
-    --k8s-mode-off-cluster-endpoint=$OPENSHIFT_API \
+    --k8s-mode-off-cluster-endpoint=$(oc whoami --show-server) \
     --k8s-mode-off-cluster-skip-verify-tls=true \
     --listen=http://127.0.0.1:9000 \
     --public-dir=./frontend/public/dist \
diff --git a/frontend/OWNERS b/frontend/OWNERS
new file mode 100644
index 00000000000..e06be378eec
--- /dev/null
+++ b/frontend/OWNERS
@@ -0,0 +1,20 @@
+reviewers:
+  - alecmerdler
+  - benjaminapetersen
+  - dtaylor113
+  - jcaianirh
+  - jeff-phillips-18
+  - jhadvig
+  - kyoto
+  - rhamilto
+  - spadgett
+  - TheRealJon
+  - zherman0
+approvers:
+  - alecmerdler
+  - benjaminapetersen
+  - bparees
+  - jhadvig
+  - kyoto
+  - rhamilto
+  - spadgett
diff --git a/frontend/__mocks__/operatorHubItemsMocks.ts b/frontend/__mocks__/operatorHubItemsMocks.ts
index 17169da21ce..83188626d41 100644
--- a/frontend/__mocks__/operatorHubItemsMocks.ts
+++ b/frontend/__mocks__/operatorHubItemsMocks.ts
@@ -65,6 +65,7 @@ const etcdPackageManifest = {
       'catalog-namespace': 'openshift-operator-lifecycle-manager',
       provider: 'CoreOS, Inc',
       'provider-url': '',
+      'opsrc-provider': 'community',
     },
   },
   spec: {},
diff --git a/frontend/__tests__/components/utils/datetime.ts b/frontend/__tests__/components/utils/datetime.ts
index 93954748635..f1565ad851e 100644
--- a/frontend/__tests__/components/utils/datetime.ts
+++ b/frontend/__tests__/components/utils/datetime.ts
@@ -1,4 +1,4 @@
-import { fromNow, isValid, formatDuration } from '../../../public/components/utils/datetime';
+import { fromNow, isValid, formatDuration, formatPrometheusDuration, parsePrometheusDuration } from '../../../public/components/utils/datetime';
 
 describe('fromNow', () => {
   it('prints past dates correctly', () => {
@@ -92,3 +92,84 @@ describe('formatDuration', () => {
   });
 });
 
+// Converts time durations to milliseconds
+const ms = (s = 0, m = 0, h = 0, d = 0, w = 0) => ((((w * 7 + d) * 24 + h) * 60 + m) * 60 + s) * 1000;
+
+describe('formatPrometheusDuration', () => {
+  it('formats durations correctly', () => {
+    expect(formatPrometheusDuration(ms(1))).toEqual('1s');
+    expect(formatPrometheusDuration(ms(2, 1))).toEqual('1m 2s');
+    expect(formatPrometheusDuration(ms(3, 2, 1))).toEqual('1h 2m 3s');
+    expect(formatPrometheusDuration(ms(4, 3, 2, 1))).toEqual('1d 2h 3m 4s');
+    expect(formatPrometheusDuration(ms(5, 4, 3, 2, 1))).toEqual('1w 2d 3h 4m 5s');
+  });
+
+  it('handles invalid values', () => {
+    [null, undefined, 0, -1, -9999].forEach(v => expect(formatPrometheusDuration(v)).toEqual(''));
+  });
+});
+
+describe('parsePrometheusDuration', () => {
+  it('parses durations correctly', () => {
+    expect(parsePrometheusDuration('1s')).toEqual(ms(1));
+    expect(parsePrometheusDuration('100s')).toEqual(ms(100));
+    expect(parsePrometheusDuration('1m')).toEqual(ms(0, 1));
+    expect(parsePrometheusDuration('90m')).toEqual(ms(0, 90));
+    expect(parsePrometheusDuration('1h')).toEqual(ms(0, 0, 1));
+    expect(parsePrometheusDuration('2h 0m 0s')).toEqual(ms(0, 0, 2));
+    expect(parsePrometheusDuration('13h 10m 23s')).toEqual(ms(23, 10, 13));
+    expect(parsePrometheusDuration('25h 61m 61s')).toEqual(ms(61, 61, 25));
+    expect(parsePrometheusDuration('123h')).toEqual(ms(0, 0, 123));
+    expect(parsePrometheusDuration('1d')).toEqual(ms(0, 0, 0, 1));
+    expect(parsePrometheusDuration('2d 6h')).toEqual(ms(0, 0, 6, 2));
+    expect(parsePrometheusDuration('8d 12h')).toEqual(ms(0, 0, 12, 8));
+    expect(parsePrometheusDuration('10d 12h 30m 1s')).toEqual(ms(1, 30, 12, 10));
+    expect(parsePrometheusDuration('1w')).toEqual(ms(0, 0, 0, 0, 1));
+    expect(parsePrometheusDuration('5w 10d 12h 30m 1s')).toEqual(ms(1, 30, 12, 10, 5));
+    expect(parsePrometheusDuration('999w 999h 999s')).toEqual(ms(999, 0, 999, 0, 999));
+  });
+
+  it('handles 0 values', () => {
+    expect(parsePrometheusDuration('0s')).toEqual(0);
+    expect(parsePrometheusDuration('0w 0d 0h 0m 0s')).toEqual(0);
+    expect(parsePrometheusDuration('00h 000000m 0s')).toEqual(0);
+  });
+
+  it('handles invalid duration formats', () => {
+    [
+      '',
+      null,
+      undefined,
+      '0',
+      '12',
+      'z',
+      'h',
+      'abc',
+      '全角',
+      '0.5h',
+      '1hh',
+      '1h1m',
+      '1h h',
+      '1h 0',
+      '1h 0z',
+      '-1h',
+    ].forEach(v => expect(parsePrometheusDuration(v)).toEqual(0));
+  });
+
+  it('mirrors formatPrometheusDuration()', () => {
+    [
+      '1s',
+      '1m',
+      '1h',
+      '1m 40s',
+      '13h 10m 23s',
+      '2h 10s',
+      '1d',
+      '2d 6h',
+      '1w',
+      '5w 6d 12h 30m 1s',
+      '999w',
+      '',
+    ].forEach(v => expect(formatPrometheusDuration(parsePrometheusDuration(v))).toEqual(v));
+  });
+});
diff --git a/frontend/integration-tests/protractor.conf.ts b/frontend/integration-tests/protractor.conf.ts
index 07d898f4bec..2a895e0ecf7 100644
--- a/frontend/integration-tests/protractor.conf.ts
+++ b/frontend/integration-tests/protractor.conf.ts
@@ -91,11 +91,21 @@ export const config: Config = {
     newApp: ['tests/base.scenario.ts', 'tests/overview/overview.scenario.ts', 'tests/source-to-image.scenario.ts', 'tests/deploy-image.scenario.ts'],
     olm: ['tests/base.scenario.ts', 'tests/olm/descriptors.scenario.ts', 'tests/olm/catalog.scenario.ts', 'tests/olm/prometheus.scenario.ts', 'tests/olm/etcd.scenario.ts'],
     olmUpgrade: ['tests/base.scenario.ts', 'tests/olm/update-channel-approval.scenario.ts'],
+    operatorHub: ['tests/base.scenario.ts', 'tests/operator-hub/operator-hub.scenario.ts'],
+    // OLM and OperatorHub
+    olmFull: [
+      'tests/base.scenario.ts',
+      'tests/operator-hub/operator-hub.scenario.ts',
+      'tests/olm/descriptors.scenario.ts',
+      'tests/olm/catalog.scenario.ts',
+      'tests/olm/prometheus.scenario.ts',
+      'tests/olm/etcd.scenario.ts',
+    ],
     performance: ['tests/base.scenario.ts', 'tests/performance.scenario.ts'],
     serviceCatalog: ['tests/base.scenario.ts', 'tests/service-catalog/service-catalog.scenario.ts', 'tests/service-catalog/service-broker.scenario.ts', 'tests/service-catalog/service-class.scenario.ts', 'tests/service-catalog/service-binding.scenario.ts', 'tests/developer-catalog.scenario.ts'],
-    operatorHub: ['tests/base.scenario.ts', 'tests/operator-hub/operator-hub.scenario.ts'],
     overview: ['tests/base.scenario.ts', 'tests/overview/overview.scenario.ts'],
-    e2e: ['tests/base.scenario.ts',
+    e2e: [
+      'tests/base.scenario.ts',
       'tests/crud.scenario.ts',
       'tests/secrets.scenario.ts',
       'tests/filter.scenario.ts',
@@ -105,12 +115,9 @@ export const config: Config = {
       'tests/source-to-image.scenario.ts',
       'tests/deploy-image.scenario.ts',
       'tests/performance.scenario.ts',
-      'tests/olm/descriptors.scenario.ts',
-      'tests/olm/catalog.scenario.ts',
-      'tests/operator-hub/operator-hub.scenario.ts',
-      'tests/olm/prometheus.scenario.ts',
-      'tests/olm/etcd.scenario.ts'],
-    all: ['tests/base.scenario.ts',
+    ],
+    all: [
+      'tests/base.scenario.ts',
       'tests/crud.scenario.ts',
       'tests/overview/overview.scenareio.ts',
       'tests/secrets.scenario.ts',
@@ -121,7 +128,8 @@ export const config: Config = {
       'tests/source-to-image.scenario.ts',
       'tests/deploy-image.scenario.ts',
       'tests/operator-hub/operator-hub.scenario.ts',
-      'tests/developer-catalog.scenario.ts'],
+      'tests/developer-catalog.scenario.ts',
+    ],
   },
   params: {
     // Set to 'true' to enable OpenShift resources in the crud scenario.
diff --git a/frontend/integration-tests/tests/crud.scenario.ts b/frontend/integration-tests/tests/crud.scenario.ts
index b255a2a9a9c..6d036cd98c6 100644
--- a/frontend/integration-tests/tests/crud.scenario.ts
+++ b/frontend/integration-tests/tests/crud.scenario.ts
@@ -271,14 +271,16 @@ describe('Kubernetes resource CRUD operations', () => {
     it('displays YAML editor for creating a new custom resource instance', async() => {
       await browser.get(`${appHost}/k8s/cluster/customresourcedefinitions?name=${name}`);
       await crudView.isLoaded();
-      await crudView.resourceRows.first().element(by.linkText(crd.spec.names.kind)).click();
+      await crudView.resourceRows.$$('.co-kebab__button').click();
+      await browser.wait(until.elementToBeClickable($('.co-kebab__dropdown')));
+      await $('.co-kebab__dropdown').$$('a').filter(link => link.getText().then(text => text.startsWith('View Instances'))).first().click();
       await crudView.isLoaded();
       await crudView.createYAMLButton.click();
       await yamlView.isLoaded();
       expect(yamlView.editorContent.getText()).toContain(`kind: CRD${testName}`);
     });
 
-    xit('creates a new custom resource instance', async() => {
+    it('creates a new custom resource instance', async() => {
       leakedResources.add(JSON.stringify({name, plural: 'customresourcedefinitions'}));
       await yamlView.saveButton.click();
       expect(crudView.errorMessage.isPresent()).toBe(false);
diff --git a/frontend/integration-tests/tests/developer-catalog.scenario.ts b/frontend/integration-tests/tests/developer-catalog.scenario.ts
index eeba3103180..dd77bd20754 100644
--- a/frontend/integration-tests/tests/developer-catalog.scenario.ts
+++ b/frontend/integration-tests/tests/developer-catalog.scenario.ts
@@ -1,13 +1,15 @@
 /* eslint-disable no-undef, no-unused-vars */
 
-import { browser, $ } from 'protractor';
+import { browser, $, $$, ExpectedConditions as until } from 'protractor';
+import { execSync } from 'child_process';
 
 import { appHost, checkLogs, checkErrors, testName } from '../protractor.conf';
 import * as crudView from '../views/crud.view';
 import * as catalogView from '../views/catalog.view';
 import * as catalogPageView from '../views/catalog-page.view';
+import * as srvCatalogView from '../views/service-catalog.view';
 
-describe('Catalog', () => {
+describe('Developer Catalog', () => {
   beforeEach(async() => {
     await browser.get(`${appHost}/catalog/ns/${testName}`);
     await crudView.isLoaded();
@@ -92,4 +94,39 @@ describe('Catalog', () => {
     const numCatalogTiles = await catalogView.pageHeadingNumberOfItems();
     expect(srvClassFilterCount).toEqual(numCatalogTiles);
   });
+
+  it('creates a service instance and binding', async() => {
+    expect(catalogPageView.catalogTiles.isPresent()).toBe(true);
+
+    await catalogPageView.clickFilterCheckbox('Service Class');
+    await catalogPageView.filterByKeyword('MongoDB');
+    expect(catalogPageView.catalogTileFor('MongoDB').isDisplayed()).toBe(true);
+
+    await catalogPageView.catalogTileFor('MongoDB').click();
+    await catalogView.catalogDetailsLoaded();
+
+    expect(catalogView.createServiceInstanceButton.isDisplayed()).toBe(true);
+    await catalogView.createServiceInstanceButton.click();
+    await browser.wait(until.and(crudView.untilNoLoadersPresent, until.presenceOf(catalogView.createServiceInstanceForm)));
+
+    await $('#dropdown-selectbox').click();
+    await $$('.dropdown-menu').first().$(`#${testName}-Project-link`).click();
+    await srvCatalogView.createButton.click();
+    await crudView.isLoaded();
+
+    expect(crudView.resourceTitle.getText()).toEqual('mongodb-persistent');
+
+    await catalogView.createServiceBindingButton.click();
+    await browser.wait(crudView.untilNoLoadersPresent);
+    expect($('#resource-title').getText()).toBe('Create Service Binding');
+
+    await srvCatalogView.createButton.click();
+    await crudView.isLoaded();
+
+    expect($('#resource-title').getText()).toBe('mongodb-persistent');
+    expect($$('.co-section-heading').first().getText()).toBe('Service Binding Overview');
+
+    execSync(`kubectl delete -n ${testName} servicebinding mongodb-persistent`);
+    execSync(`kubectl delete -n ${testName} serviceinstance mongodb-persistent`);
+  });
 });
diff --git a/frontend/integration-tests/tests/operator-hub/operator-hub.scenario.ts b/frontend/integration-tests/tests/operator-hub/operator-hub.scenario.ts
index bcd0b7bdb4b..22933f60f68 100644
--- a/frontend/integration-tests/tests/operator-hub/operator-hub.scenario.ts
+++ b/frontend/integration-tests/tests/operator-hub/operator-hub.scenario.ts
@@ -9,14 +9,15 @@ import * as catalogView from '../../views/catalog.view';
 import * as catalogPageView from '../../views/catalog-page.view';
 import * as operatorHubView from '../../views/operator-hub.view';
 
-describe('Subscribing to an Operator from Operator Hub', () => {
+describe('Subscribing to an Operator from OperatorHub', () => {
   const openCloudServices = new Set(['AMQ Streams', 'MongoDB']);
 
   afterAll(() => {
     // FIXME: Don't hardcode namespace for running tests against upstream k8s
-    execSync('kubectl delete catalogsourceconfig -n openshift-marketplace installed-community-openshift-operators');
-    execSync('kubectl delete subscription -n openshift-operators --all');
-    execSync('kubectl delete clusterserviceversion -n openshift-operators --all');
+    execSync(`kubectl delete catalogsourceconfig -n openshift-marketplace installed-community-${testName}`);
+    execSync(`kubectl delete subscription -n ${testName} --all`);
+    execSync(`kubectl delete clusterserviceversion -n ${testName} --all`);
+    execSync(`kubectl delete operatorgroup -n ${testName} --all`);
   });
 
   afterEach(() => {
@@ -24,8 +25,8 @@ describe('Subscribing to an Operator from Operator Hub', () => {
     checkErrors();
   });
 
-  it('displays Operator Hub with expected available operators', async() => {
-    await browser.get(`${appHost}/operatorhub`);
+  it('displays OperatorHub with expected available operators', async() => {
+    await browser.get(`${appHost}/operatorhub/ns/${testName}`);
     await crudView.isLoaded();
 
     openCloudServices.forEach(name => {
@@ -33,12 +34,12 @@ describe('Subscribing to an Operator from Operator Hub', () => {
     });
   });
 
-  it('displays Couchbase Operator operator when filter "MongoDB" is active', async() => {
-    await catalogPageView.clickFilterCheckbox('MongoDB');
+  it('displays Couchbase Operator operator when filter "Couchbase" is active', async() => {
+    await catalogPageView.clickFilterCheckbox('Couchbase');
 
     expect(catalogPageView.catalogTileFor('Couchbase Operator').isDisplayed()).toBe(true);
 
-    await catalogPageView.clickFilterCheckbox('MongoDB');
+    await catalogPageView.clickFilterCheckbox('Couchbase');
   });
 
   it('does not display Couchbase Operator operator when filter "Red Hat" is active', async() => {
@@ -89,24 +90,35 @@ describe('Subscribing to an Operator from Operator Hub', () => {
     });
   });
 
-  it('hides community Operators when "Show Community Operators" is not accepted', async() => {
-    expect(catalogPageView.catalogTileCount('etcd')).toBe(0);
+  it('shows the warning dialog when a community operator is clicked', async() => {
+    await(catalogPageView.catalogTileFor('etcd').click());
+    await operatorHubView.operatorCommunityWarningIsLoaded();
+    await operatorHubView.closeCommunityWarningModal();
+    await operatorHubView.operatorCommunityWarningIsClosed();
   });
 
-  it('shows community operators when "Show Community Operators" is accepted', async() => {
-    await operatorHubView.showCommunityOperators();
-    await catalogPageView.clickFilterCheckbox('Community');
+  it('shows the community operator when "Show Community Operators" is accepted', async() => {
+    await(catalogPageView.catalogTileFor('etcd').click());
+    await operatorHubView.operatorCommunityWarningIsLoaded();
+    await operatorHubView.acceptCommunityWarningModal();
+    await operatorHubView.operatorCommunityWarningIsClosed();
+
+    expect(operatorHubView.operatorModal.isDisplayed()).toBe(true);
+    expect(operatorHubView.operatorModalTitle.getText()).toEqual('etcd');
 
-    expect(catalogPageView.catalogTileCount('etcd')).toBe(1);
+    await operatorHubView.closeOperatorModal();
+    await operatorHubView.operatorModalIsClosed();
   });
 
-  it('filters Operator Hub tiles by Category', async() => {
+  it('filters OperatorHub tiles by Category', async() => {
     expect(catalogPageView.catalogTiles.isPresent()).toBe(true);
     expect(catalogView.categoryTabs.isPresent()).toBe(true);
   });
 
   it('displays subscription creation form for selected Operator', async() => {
     await catalogPageView.catalogTileFor('etcd').click();
+    await operatorHubView.operatorCommunityWarningIsLoaded();
+    await operatorHubView.acceptCommunityWarningModal();
     await operatorHubView.operatorModalIsLoaded();
     await operatorHubView.operatorModalInstallBtn.click();
 
@@ -117,22 +129,26 @@ describe('Subscribing to an Operator from Operator Hub', () => {
   it('selects target namespace for Operator subscription', async() => {
     await browser.wait(until.visibilityOf(operatorHubView.createSubscriptionFormInstallMode));
 
-    expect($('input[value="AllNamespaces"]').getAttribute('disabled')).toBe(null);
+    expect($('input[value="OwnNamespace"]').getAttribute('disabled')).toBe(null);
   });
 
-  it('displays Operator as subscribed in Operator Hub', async() => {
+  it('displays Operator as subscribed in OperatorHub', async() => {
+    await operatorHubView.installNamespaceDropdownBtn.click();
+    await operatorHubView.installNamespaceDropdownFilter(testName);
+    await operatorHubView.installNamespaceDropdownSelect(testName).click();
+
     await operatorHubView.createSubscriptionFormBtn.click();
     await crudView.isLoaded();
-    await operatorHubView.showCommunityOperators();
 
     expect(catalogPageView.catalogTileFor('etcd').$('.catalog-tile-pf-footer').getText()).toContain('Installed');
   });
 
-  it('displays Operator in "Cluster Service Versions" view for "default" namespace', async() => {
+  it(`displays Operator in "Cluster Service Versions" view for "${testName}" namespace`, async() => {
     await browser.get(`${appHost}/operatorhub/ns/${testName}`);
     await crudView.isLoaded();
-    await operatorHubView.showCommunityOperators();
     await catalogPageView.catalogTileFor('etcd').click();
+    await operatorHubView.operatorCommunityWarningIsLoaded();
+    await operatorHubView.acceptCommunityWarningModal();
     await operatorHubView.operatorModalIsLoaded();
     await operatorHubView.viewInstalledOperator();
     await crudView.isLoaded();
diff --git a/frontend/integration-tests/tests/performance.scenario.ts b/frontend/integration-tests/tests/performance.scenario.ts
index 0a09bc16e8b..cba819b23d6 100644
--- a/frontend/integration-tests/tests/performance.scenario.ts
+++ b/frontend/integration-tests/tests/performance.scenario.ts
@@ -26,13 +26,13 @@ const chunkedRoutes = OrderedMap<string, {section: string, name: string}>()
   .set('storage-class', {section: 'Storage', name: 'Storage Classes'})
   .set('build-config', {section: 'Builds', name: 'Build Configs'})
   .set('image-stream', {section: 'Builds', name: 'Image Streams'})
-  .set('node', {section: 'Administration', name: 'Nodes'})
+  .set('node', {section: 'Compute', name: 'Nodes'})
   .set('service-account', {section: 'Administration', name: 'Service Accounts'})
   .set('resource-quota', {section: 'Administration', name: 'Resource Quotas'})
   .set('limit-range', {section: 'Administration', name: 'Limit Ranges'})
   .set('custom-resource-definition', {section: 'Administration', name: 'CRDs'})
   .set('catalog', {section: 'Catalog', name: 'Developer Catalog'})
-  .set('operator-hub', {section: 'Catalog', name: 'Operator Hub'});
+  .set('operator-hub', {section: 'Catalog', name: 'OperatorHub'});
 
 describe('Performance test', () => {
 
diff --git a/frontend/integration-tests/views/catalog.view.ts b/frontend/integration-tests/views/catalog.view.ts
index ba7d77760f6..aeed9948ce8 100644
--- a/frontend/integration-tests/views/catalog.view.ts
+++ b/frontend/integration-tests/views/catalog.view.ts
@@ -1,4 +1,4 @@
-import { $, $$, browser, ExpectedConditions as until } from 'protractor';
+import { $, $$, browser, by, ExpectedConditions as until } from 'protractor';
 
 export const categoryTabs = $$('.vertical-tabs-pf-tab > a');
 export const pageHeading = $('.co-catalog-page__heading');
@@ -6,3 +6,6 @@ export const pageNumberItemsHeading = $('.co-catalog-page__num-items');
 export const pageHeadingNumberOfItems = () => pageNumberItemsHeading.getText()
   .then(text => parseInt(text.substring(0, text.indexOf(' items')), 10));
 export const catalogDetailsLoaded = () => browser.wait(until.presenceOf($('.modal-content')), 10000).then(() => browser.sleep(1000));
+export const createServiceInstanceButton = $('.co-catalog-page__overlay-create');
+export const createServiceInstanceForm = $('.co-create-service-instance');
+export const createServiceBindingButton = $('.co-well').element(by.buttonText('Create Service Binding'));
diff --git a/frontend/integration-tests/views/operator-hub.view.ts b/frontend/integration-tests/views/operator-hub.view.ts
index 08433561358..f5bdc33a4e9 100644
--- a/frontend/integration-tests/views/operator-hub.view.ts
+++ b/frontend/integration-tests/views/operator-hub.view.ts
@@ -1,6 +1,6 @@
 /* eslint-disable no-undef, no-unused-vars */
 
-import { browser, $, ExpectedConditions as until, $$, by, element } from 'protractor';
+import { browser, $, ExpectedConditions as until, by, element } from 'protractor';
 
 export const operatorModal = $('.modal-content');
 export const operatorModalIsLoaded = () => browser.wait(until.presenceOf(operatorModal), 1000)
@@ -16,9 +16,17 @@ export const createSubscriptionFormTitle = element(by.cssContainingText('h1', 'C
 export const createSubscriptionFormBtn = element(by.buttonText('Subscribe'));
 export const createSubscriptionFormInstallMode = element(by.cssContainingText('label', 'Installation Mode'));
 
-export const showCommunityOperators = async() => {
-  await $$('.co-catalog-page__filter-toggle').click();
-  await browser.wait(until.presenceOf($('.co-modal-ignore-warning')), 1000).then(() => browser.sleep(500));
-  await $('.co-modal-ignore-warning').$('.btn-primary').click();
-  await browser.wait(until.not(until.presenceOf($('.co-modal-ignore-warning'))), 1000).then(() => browser.sleep(500));
-};
+export const installNamespaceDropdown = $('.dropdown--full-width');
+export const installNamespaceDropdownBtn = installNamespaceDropdown.$('.dropdown-toggle');
+export const installNamespaceDropdownFilter = (filter: string) => installNamespaceDropdown
+  .$('.dropdown-menu__filter').$('input').sendKeys(filter);
+export const installNamespaceDropdownSelect = (namespace: string) => installNamespaceDropdown
+  .$(`#${namespace}-Project-link`);
+
+export const communityWarningModal = $('.co-modal-ignore-warning');
+export const operatorCommunityWarningIsLoaded = () => browser.wait(until.presenceOf(communityWarningModal), 1000)
+  .then(() => browser.sleep(500));
+export const operatorCommunityWarningIsClosed = () => browser.wait(until.not(until.presenceOf(communityWarningModal)), 1000)
+  .then(() => browser.sleep(500));
+export const closeCommunityWarningModal = () => communityWarningModal.$('.btn-default').click();
+export const acceptCommunityWarningModal = () => communityWarningModal.$('.btn-primary').click();
diff --git a/frontend/package.json b/frontend/package.json
index d64c8e83170..08ead58ee1d 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -53,8 +53,8 @@
     ]
   },
   "dependencies": {
-    "@patternfly/patternfly-next": "^1.0.109",
-    "@patternfly/react-core": "^1.43.5",
+    "@patternfly/patternfly": "1.0.219",
+    "@patternfly/react-core": "2.4.1",
     "brace": "0.11.x",
     "classnames": "2.x",
     "core-js": "2.x",
@@ -69,9 +69,9 @@
     "murmurhash-js": "1.0.x",
     "openshift-logos-icon": "1.7.1",
     "patternfly": "^3.59.0",
-    "patternfly-react": "^2.29.1",
-    "patternfly-react-extensions": "2.14.1",
-    "plotly.js": "1.28.x",
+    "patternfly-react": "2.29.17",
+    "patternfly-react-extensions": "2.16.19",
+    "plotly.js": "1.44.4",
     "prop-types": "15.6.x",
     "react": "16.6.3",
     "react-copy-to-clipboard": "5.x",
diff --git a/frontend/public/branding.ts b/frontend/public/branding.ts
index 77bc6ae0c87..1e31d4303ae 100644
--- a/frontend/public/branding.ts
+++ b/frontend/public/branding.ts
@@ -8,6 +8,8 @@ const getProductName = () => {
       return 'OpenShift Online';
     case 'dedicated':
       return 'OpenShift Dedicated';
+    case 'azure':
+      return 'Azure Red Hat OpenShift';
     default:
       return 'OKD';
   }
diff --git a/frontend/public/components/_resource.scss b/frontend/public/components/_resource.scss
index 033ed8ac2a8..308eb9f8f53 100644
--- a/frontend/public/components/_resource.scss
+++ b/frontend/public/components/_resource.scss
@@ -16,8 +16,7 @@
     line-height: 21px;
     margin-right: 7px;
     min-width: 24px;
-    padding-left: 7px;
-    padding-right: 7px;
+    padding: 0 7px;
   }
 }
 
diff --git a/frontend/public/components/about-modal.jsx b/frontend/public/components/about-modal.jsx
index 55fcc4d15d9..8d10eeee09b 100644
--- a/frontend/public/components/about-modal.jsx
+++ b/frontend/public/components/about-modal.jsx
@@ -39,7 +39,6 @@ class AboutModal_ extends React.Component {
         brandImageAlt={details.logoAlt}
         logoImageSrc={details.logoImg}
         logoImageAlt={details.logoAlt}
-        heroImageSrc={details.backgroundImg}
       >
         <p>OpenShift is Red Hat&apos;s container application platform that allows developers to quickly develop, host,
           and scale applications in a cloud environment.</p>
diff --git a/frontend/public/components/app.jsx b/frontend/public/components/app.jsx
index 4e9752f39ed..101edd39a58 100644
--- a/frontend/public/components/app.jsx
+++ b/frontend/public/components/app.jsx
@@ -11,7 +11,6 @@ import { productName } from '../branding';
 import { ALL_NAMESPACES_KEY } from '../const';
 import { connectToFlags, featureActions, flagPending, FLAGS } from '../features';
 import { analyticsSvc } from '../module/analytics';
-import { ClusterSettingsPage } from './cluster-settings/cluster-settings';
 import { GlobalNotifications } from './global-notifications';
 import { Masthead } from './masthead';
 import { NamespaceBar } from './namespace';
@@ -264,7 +263,8 @@ class App extends React.PureComponent {
 
                   <LazyRoute path="/monitoring" loader={() => import('./monitoring' /* webpackChunkName: "monitoring" */).then(m => m.MonitoringUI)} />
 
-                  <Route path="/settings/cluster" component={ClusterSettingsPage} />
+                  <LazyRoute path="/settings/idp/htpasswd" exact loader={() => import('./cluster-settings/htpasswd-idp-form' /* webpackChunkName: "htpasswd-idp-form" */).then(m => m.AddHTPasswdPage)} />
+                  <LazyRoute path="/settings/cluster" loader={() => import('./cluster-settings/cluster-settings' /* webpackChunkName: "cluster-settings" */).then(m => m.ClusterSettingsPage)} />
 
                   <LazyRoute path={'/k8s/cluster/storageclasses/new/form'} exact loader={() => import('./storage-class-form' /* webpackChunkName: "storage-class-form" */).then(m => m.StorageClassForm)} />
 
diff --git a/frontend/public/components/build-config.tsx b/frontend/public/components/build-config.tsx
index 3f576093c3e..aa52fa08745 100644
--- a/frontend/public/components/build-config.tsx
+++ b/frontend/public/components/build-config.tsx
@@ -36,7 +36,7 @@ export const BuildConfigsDetails: React.SFC<BuildConfigsDetailsProps> = ({obj: b
     <SectionHeading text="Build Config Overview" />
     <div className="row">
       <div className="col-sm-6">
-        <ResourceSummary resource={buildConfig} showPodSelector={false} showNodeSelector={false} />
+        <ResourceSummary resource={buildConfig} />
       </div>
       <div className="col-sm-6">
         <BuildStrategy resource={buildConfig} />
diff --git a/frontend/public/components/build.tsx b/frontend/public/components/build.tsx
index ef93c26315b..65b3206cdf7 100644
--- a/frontend/public/components/build.tsx
+++ b/frontend/public/components/build.tsx
@@ -123,7 +123,7 @@ export const BuildsDetails: React.SFC<BuildsDetailsProps> = ({ obj: build }) =>
       </div>}
       <div className="row">
         <div className="col-sm-6">
-          <ResourceSummary resource={build} showPodSelector={false} showNodeSelector={false}>
+          <ResourceSummary resource={build}>
             {triggeredBy && <dt>Triggered By</dt>}
             {triggeredBy && <dd>{triggeredBy}</dd>}
             {startTimestamp && <dt>Started</dt>}
diff --git a/frontend/public/components/catalog/_catalog.scss b/frontend/public/components/catalog/_catalog.scss
index 1123fa7b724..2abd8b5d2c4 100644
--- a/frontend/public/components/catalog/_catalog.scss
+++ b/frontend/public/components/catalog/_catalog.scss
@@ -198,6 +198,8 @@ $co-modal-ignore-warning-icon-width: 30px;
 }
 
 .co-modal-ignore-warning {
+  height: initial;
+
   &__checkbox.checkbox {
     margin-bottom: 0;
     padding-top: 15px;
diff --git a/frontend/public/components/chargeback.tsx b/frontend/public/components/chargeback.tsx
index 9696d14a236..67b3534d33e 100644
--- a/frontend/public/components/chargeback.tsx
+++ b/frontend/public/components/chargeback.tsx
@@ -101,7 +101,7 @@ class ReportsDetails extends React.Component<ReportsDetailsProps> {
         <SectionHeading text="Report Overview" />
         <div className="row">
           <div className="col-sm-6 col-xs-12">
-            <ResourceSummary resource={obj} showNodeSelector={false} showPodSelector={false} showAnnotations={true} />
+            <ResourceSummary resource={obj} />
           </div>
           <div className="col-sm-6 col-xs-12">
             <dl className="co-m-pane__details">
@@ -439,7 +439,7 @@ const ReportGenerationQueriesDetails: React.SFC<ReportGenerationQueriesDetailsPr
   return <div>
     <div className="co-m-pane__body">
       <SectionHeading text="Chargeback Report Generation Query" />
-      <ResourceSummary resource={obj} showNodeSelector={false} showPodSelector={false} showAnnotations={true}>
+      <ResourceSummary resource={obj}>
         <dt>Query</dt>
         <dd><pre><code>{_.get(obj, ['spec', 'query'])}</code></pre></dd>
         <div className="row">
diff --git a/frontend/public/components/cluster-service-broker.tsx b/frontend/public/components/cluster-service-broker.tsx
index b39411e4e98..dfcbf5d12e2 100644
--- a/frontend/public/components/cluster-service-broker.tsx
+++ b/frontend/public/components/cluster-service-broker.tsx
@@ -42,7 +42,7 @@ const ClusterServiceBrokerDetails: React.SFC<ClusterServiceBrokerDetailsProps> =
       <SectionHeading text="Service Broker Overview" />
       <div className="row">
         <div className="col-md-6">
-          <ResourceSummary resource={serviceBroker} showPodSelector={false} showNodeSelector={false} />
+          <ResourceSummary resource={serviceBroker} />
           <dt>Last Catalog Retrieval Time</dt>
           <dd><Timestamp timestamp={serviceBroker.status.lastCatalogRetrievalTime} /></dd>
           {serviceBroker.spec.insecureSkipTLSVerify && <dt>Insecure Skip TLS Verify</dt>}
diff --git a/frontend/public/components/cluster-service-class.tsx b/frontend/public/components/cluster-service-class.tsx
index 3fd6ce7c7e9..4a4c2698009 100644
--- a/frontend/public/components/cluster-service-class.tsx
+++ b/frontend/public/components/cluster-service-class.tsx
@@ -59,7 +59,7 @@ const ClusterServiceClassDetails: React.SFC<ClusterServiceClassDetailsProps> = (
     </div>
     <div className="col-md-5 col-md-pull-7">
       <SectionHeading text="Service Class Overview" />
-      <ResourceSummary resource={serviceClass} showPodSelector={false} showNodeSelector={false}>
+      <ResourceSummary resource={serviceClass}>
         <dt>External Name</dt>
         <dd>{serviceClass.spec.externalName || '-'}</dd>
       </ResourceSummary>
diff --git a/frontend/public/components/cluster-service-plan.tsx b/frontend/public/components/cluster-service-plan.tsx
index d7256c05af0..ee855705cf2 100644
--- a/frontend/public/components/cluster-service-plan.tsx
+++ b/frontend/public/components/cluster-service-plan.tsx
@@ -32,7 +32,7 @@ const ClusterServicePlanDetails: React.SFC<ClusterServicePlanDetailsProps> = ({o
     <SectionHeading text="Service Plan Overview" />
     <div className="row">
       <div className="col-md-6">
-        <ResourceSummary resource={servicePlan} showPodSelector={false} showNodeSelector={false} />
+        <ResourceSummary resource={servicePlan} />
       </div>
       <div className="col-md-6">
         <dl className="co-m-pane__details">
diff --git a/frontend/public/components/cluster-settings/cluster-operator.tsx b/frontend/public/components/cluster-settings/cluster-operator.tsx
index c305952a9bb..634081e4f15 100644
--- a/frontend/public/components/cluster-settings/cluster-operator.tsx
+++ b/frontend/public/components/cluster-settings/cluster-operator.tsx
@@ -12,14 +12,17 @@ import {
 } from '../factory';
 import {
   getClusterOperatorStatus,
+  getClusterOperatorVersion,
   getStatusAndMessage,
-  K8sResourceKind,
+  ClusterOperator,
   K8sResourceKindReference,
+  OperandVersion,
   OperatorStatus,
   referenceForModel,
 } from '../../module/k8s';
 import {
   navFactory,
+  EmptyBox,
   ResourceLink,
   ResourceSummary,
   SectionHeading,
@@ -30,7 +33,7 @@ export const clusterOperatorReference: K8sResourceKindReference = referenceForMo
 const getIconClass = (status: OperatorStatus) => {
   return {
     [OperatorStatus.Available]: 'pficon pficon-ok text-success',
-    [OperatorStatus.Updating]: 'pficon pficon-in-progress',
+    [OperatorStatus.Updating]: 'fa fa-refresh',
     [OperatorStatus.Failing]: 'pficon pficon-error-circle-o text-danger',
   }[status];
 };
@@ -46,11 +49,12 @@ const ClusterOperatorHeader = props => <ListHeader>
   <ColHead {...props} className="col-md-3 col-sm-3 col-xs-6" sortField="metadata.name">Name</ColHead>
   <ColHead {...props} className="col-md-2 col-sm-3 col-xs-6" sortFunc="getClusterOperatorStatus">Status</ColHead>
   <ColHead {...props} className="col-md-4 col-sm-3 hidden-xs">Message</ColHead>
-  <ColHead {...props} className="col-md-3 col-sm-3 hidden-xs" sortField="status.version">Version</ColHead>
+  <ColHead {...props} className="col-md-3 col-sm-3 hidden-xs" sortFunc="getClusterOperatorVersion">Version</ColHead>
 </ListHeader>;
 
 const ClusterOperatorRow: React.SFC<ClusterOperatorRowProps> = ({obj}) => {
   const { status, message } = getStatusAndMessage(obj);
+  const operatorVersion = getClusterOperatorVersion(obj);
   return <div className="row co-resource-list__item">
     <div className="col-md-3 col-sm-3 col-xs-6">
       <ResourceLink kind={clusterOperatorReference} name={obj.metadata.name} namespace={obj.metadata.namespace} title={obj.metadata.name} />
@@ -62,7 +66,7 @@ const ClusterOperatorRow: React.SFC<ClusterOperatorRowProps> = ({obj}) => {
       {message ? _.truncate(message, { length: 256, separator: ' ' }) : '-'}
     </div>
     <div className="col-md-3 col-sm-3 hidden-xs">
-      {_.get(obj, 'status.version') || <span className="text-muted">Unknown</span>}
+      {operatorVersion || '-'}
     </div>
   </div>;
 };
@@ -96,17 +100,50 @@ export const ClusterOperatorPage: React.SFC<ClusterOperatorPageProps> = props =>
     rowFilters={filters}
   />;
 
+const OperandVersions: React.SFC<OperandVersionsProps> = ({versions}) => {
+  return _.isEmpty(versions)
+    ? <EmptyBox label="Versions" />
+    : <div className="co-table-container">
+      <table className="table">
+        <thead>
+          <tr>
+            <th>Name</th>
+            <th>Version</th>
+          </tr>
+        </thead>
+        <tbody>
+          {_.map(versions, ({name, version}, i) => (
+            <tr key={i}>
+              <td>{name}</td>
+              <td>{version}</td>
+            </tr>
+          ))}
+        </tbody>
+      </table>
+    </div>;
+};
+
+
 const ClusterOperatorDetails: React.SFC<ClusterOperatorDetailsProps> = ({obj}) => {
   const { status, message } = getStatusAndMessage(obj);
-  return <div className="co-m-pane__body">
-    <SectionHeading text="Cluster Operator Overview" />
-    <ResourceSummary resource={obj} showPodSelector={false} showNodeSelector={false}>
-      <dt>Status</dt>
-      <dd><OperatorStatusIconAndLabel status={status} /></dd>
-      <dt>Message</dt>
-      <dd>{message || '-'}</dd>
-    </ResourceSummary>
-  </div>;
+  const versions: OperandVersion[] = _.get(obj, 'status.versions', []);
+  return (
+    <React.Fragment>
+      <div className="co-m-pane__body">
+        <SectionHeading text="Cluster Operator Overview" />
+        <ResourceSummary resource={obj}>
+          <dt>Status</dt>
+          <dd><OperatorStatusIconAndLabel status={status} /></dd>
+          <dt>Message</dt>
+          <dd className="co-pre-line">{message || '-'}</dd>
+        </ResourceSummary>
+      </div>
+      <div className="co-m-pane__body">
+        <SectionHeading text="Operand Versions" />
+        <OperandVersions versions={versions} />
+      </div>
+    </React.Fragment>
+  );
 };
 
 export const ClusterOperatorDetailsPage: React.SFC<ClusterOperatorDetailsPageProps> = props =>
@@ -121,7 +158,7 @@ type OperatorStatusIconAndLabelProps = {
 };
 
 type ClusterOperatorRowProps = {
-  obj: K8sResourceKind;
+  obj: ClusterOperator;
 };
 
 type ClusterOperatorPageProps = {
@@ -129,8 +166,12 @@ type ClusterOperatorPageProps = {
   showTitle?: boolean;
 };
 
+type OperandVersionsProps = {
+  versions: OperandVersion[];
+};
+
 type ClusterOperatorDetailsProps = {
-  obj: K8sResourceKind;
+  obj: ClusterOperator;
 };
 
 type ClusterOperatorDetailsPageProps = {
diff --git a/frontend/public/components/cluster-settings/cluster-settings.tsx b/frontend/public/components/cluster-settings/cluster-settings.tsx
index c8c375a05e1..8063a53fc5f 100644
--- a/frontend/public/components/cluster-settings/cluster-settings.tsx
+++ b/frontend/public/components/cluster-settings/cluster-settings.tsx
@@ -1,5 +1,3 @@
-// TODO (jon) - Remove mock code from this file once cluster update feature is complete
-
 /* eslint-disable no-unused-vars, no-undef */
 
 import * as React from 'react';
@@ -8,11 +6,26 @@ import { Helmet } from 'react-helmet';
 import { Button } from 'patternfly-react';
 import { Link } from 'react-router-dom';
 
-import { ClusterVersionKind, K8sResourceKind, referenceForModel } from '../../module/k8s';
-import { ClusterAutoscalerModel, ClusterVersionModel } from '../../models';
 import { ClusterOperatorPage } from './cluster-operator';
 import { clusterChannelModal, clusterUpdateModal } from '../modals';
 import { GlobalConfigPage } from './global-config';
+import { ClusterAutoscalerModel } from '../../models';
+import {
+  ClusterUpdateStatus,
+  ClusterVersionCondition,
+  ClusterVersionConditionType,
+  ClusterVersionKind,
+  clusterVersionReference,
+  getAvailableClusterUpdates,
+  getClusterUpdateStatus,
+  getClusterVersionCondition,
+  getDesiredClusterVersion,
+  isProgressing,
+  K8sResourceConditionStatus,
+  K8sResourceKind,
+  referenceForModel,
+  updateFailing,
+} from '../../module/k8s';
 import {
   EmptyBox,
   Firehose,
@@ -23,86 +36,60 @@ import {
   Timestamp,
 } from '../utils';
 
-enum ClusterUpdateStatus {
-  UpToDate = 'Up to Date',
-  UpdatesAvailable = 'Updates Available',
-  Updating = 'Updating',
-  Failing = 'Failing',
-  ErrorRetrieving = 'Error Retrieving',
-}
-
 const clusterAutoscalerReference = referenceForModel(ClusterAutoscalerModel);
-export const clusterVersionReference = referenceForModel(ClusterVersionModel);
-
-export const getAvailableClusterChannels = () => ({'nightly-4.0': 'nightly-4.0', 'pre-release-4.0': 'pre-release-4.0', 'stable-4.0': 'stable-4.0'});
-
-export const getAvailableClusterUpdates = (cv: ClusterVersionKind) => {
-  return _.get(cv, 'status.availableUpdates');
-};
-
-export const getDesiredClusterVersion = (cv: ClusterVersionKind) => {
-  return _.get(cv, 'status.desired.version');
-};
-
-const launchUpdateModal = (cv: ClusterVersionKind) => {
-  clusterUpdateModal({cv});
-};
 
 const CurrentChannel: React.SFC<CurrentChannelProps> = ({cv}) => <button className="btn btn-link co-m-modal-link" onClick={() => (clusterChannelModal({cv}))}>
   {cv.spec.channel || '-'}
 </button>;
 
-const getClusterUpdateStatus = (cv: ClusterVersionKind): ClusterUpdateStatus => {
-  const conditions = _.get(cv, 'status.conditions', []);
-  const isFailingCondition = _.find(conditions, { type: 'Failing', status: 'True' });
-  if (isFailingCondition) {
-    return ClusterUpdateStatus.Failing;
-  }
-
-  const retrievedUpdatesFailedCondition = _.find(conditions, { type: 'RetrievedUpdates', status: 'False' });
-  if (retrievedUpdatesFailedCondition) {
-    return ClusterUpdateStatus.ErrorRetrieving;
-  }
-
-  const isProgressingCondition = _.find(conditions, { type: 'Progressing', status: 'True' });
-  if (isProgressingCondition) {
-    return ClusterUpdateStatus.Updating;
-  }
-
-  const updates = _.get(cv, 'status.availableUpdates');
-  return _.isEmpty(updates) ? ClusterUpdateStatus.UpToDate : ClusterUpdateStatus.UpdatesAvailable;
-};
-
 const getIconClass = (status: ClusterUpdateStatus) => {
   return {
     [ClusterUpdateStatus.UpToDate]: 'pficon pficon-ok',
     [ClusterUpdateStatus.UpdatesAvailable]: 'fa fa-arrow-circle-o-up',
-    [ClusterUpdateStatus.Updating]: 'fa-spin pficon pficon-in-progress',
+    [ClusterUpdateStatus.Updating]: 'fa-spin fa fa-refresh',
     [ClusterUpdateStatus.Failing]: 'pficon pficon-error-circle-o',
     [ClusterUpdateStatus.ErrorRetrieving]: 'pficon pficon-error-circle-o',
   }[status];
 };
 
-const FailedConditionAlert = ({message, condition}) => <div className="alert alert-danger">
-  <i className="pficon pficon-error-circle-o" aria-hidden="true" /> <strong>{message}</strong> {condition.message}
+const UpdateFailingAlert: React.SFC<UpdateFailingAlertProps> = ({condition, updatesAvailable=false}) => <div className="alert alert-danger">
+  <i className="pficon pficon-error-circle-o" aria-hidden="true" />
+  <strong>Update is failing.</strong>
+  &nbsp;
+  {condition.message && `${condition.message}. `}
+  View <Link to="/settings/cluster/clusteroperators?orderBy=desc&sortBy=Status">Cluster Operators</Link> for more details
+  {updatesAvailable && ' or check other available updates to try another version'}.
+</div>;
+
+const RetrieveUpdatesFailedAlert: React.SFC<RetrieveUpdatesFailedAlertProps> = ({condition}) => <div className="alert alert-danger">
+  <i className="pficon pficon-error-circle-o" aria-hidden="true" />
+  <strong>Could not retrieve updates.</strong>
+  {condition.message && ` ${condition.message}.`}
 </div>;
 
-const UpdateInProgressAlert = () => <div className="alert alert-info">
+const UpdateInProgressAlert: React.SFC<UpdateInProgressAlertProps> = ({condition}) => <div className="alert alert-info">
   <i className="pficon pficon-info" aria-hidden={true} />
-  Cluster update in progress.
+  <strong>Cluster update in progress.</strong>
   &nbsp;
-  <Link to="/settings/cluster/clusteroperators">
-    View detailed progress.
-  </Link>
+  {condition.message && `${condition.message}. `}
+  View <Link to="/settings/cluster/clusteroperators?orderBy=desc&sortBy=Status">Cluster Operators</Link> for more details.
 </div>;
 
-const UpdatesAvailableAlert = ({cv}) => <div className="alert alert-info">
-  <i className="pficon pficon-info" aria-hidden={true} />
-  Cluster update is available.
-  <Button bsStyle="link" onClick={()=> (launchUpdateModal(cv))}>
-    Update Now
-  </Button>
-</div>;
+const UpdatesAvailableAlert: React.SFC<UpdatesAvailableAlertProps> = ({cv}) => {
+  const currentlyUpdating = isProgressing(cv) || updateFailing(cv);
+  const titleText = currentlyUpdating ? 'Other updates are available.' : 'Cluster update is available.';
+  const buttonText = currentlyUpdating ? 'Update to a different version.' : 'Update now.';
+  return <div className="alert alert-info">
+    <i className="pficon pficon-info" aria-hidden={true} />
+    <strong>
+      {titleText}
+    </strong>
+    <Button bsStyle="link" className="co-m-modal-link" onClick={()=> (clusterUpdateModal({cv}))}>
+      {buttonText}
+    </Button>
+  </div>;
+};
+
 
 const UpdateStatus: React.SFC<UpdateStatusProps> = ({cv}) => {
   const status = getClusterUpdateStatus(cv);
@@ -110,7 +97,7 @@ const UpdateStatus: React.SFC<UpdateStatusProps> = ({cv}) => {
   return <React.Fragment>
     {
       status === ClusterUpdateStatus.UpdatesAvailable
-        ? <Button bsStyle="link" onClick={() => (launchUpdateModal(cv))}>
+        ? <Button bsStyle="link" className="co-m-modal-link" onClick={() => (clusterUpdateModal({cv}))}>
           <i className={iconClass} aria-hidden={true}></i>
           &nbsp;
           {status}
@@ -132,18 +119,19 @@ const DesiredVersion: React.SFC<DesiredVersionProps> = ({cv}) => {
 };
 
 const ClusterVersionDetailsTable: React.SFC<ClusterVersionDetailsTableProps> = ({obj: cv, autoscalers}) => {
-  const { history = [], conditions = [] } = cv.status;
-  const status = getClusterUpdateStatus(cv);
-  const retrievedUpdatesFailedCondition = _.find(conditions, { type: 'RetrievedUpdates', status: 'False' });
-  const isFailingCondition = _.find(conditions, { type: 'Failing', status: 'True' });
+  const { history = [] } = cv.status;
+  const retrievedUpdatesFailedCondition = getClusterVersionCondition(cv, ClusterVersionConditionType.RetrievedUpdates, K8sResourceConditionStatus.False);
+  const isFailingCondition = getClusterVersionCondition(cv, ClusterVersionConditionType.Failing, K8sResourceConditionStatus.True);
+  const updatingCondition = getClusterVersionCondition(cv, ClusterVersionConditionType.Progressing, K8sResourceConditionStatus.True);
+  const updatesAvailable = !_.isEmpty(getAvailableClusterUpdates(cv));
 
   return <React.Fragment>
     <div className="co-m-pane__body">
       <div className="co-m-pane__body-group">
-        { status === ClusterUpdateStatus.Updating && <UpdateInProgressAlert /> }
-        { status === ClusterUpdateStatus.UpdatesAvailable && <UpdatesAvailableAlert cv={cv} /> }
-        { isFailingCondition && <FailedConditionAlert message="Update is failing." condition={isFailingCondition} /> }
-        { retrievedUpdatesFailedCondition && <FailedConditionAlert message="Could not retrieve updates." condition={retrievedUpdatesFailedCondition} /> }
+        { isFailingCondition && <UpdateFailingAlert condition={isFailingCondition} updatesAvailable={updatesAvailable} /> }
+        { retrievedUpdatesFailedCondition && <RetrieveUpdatesFailedAlert condition={retrievedUpdatesFailedCondition} /> }
+        { !isFailingCondition && updatingCondition && <UpdateInProgressAlert condition={updatingCondition} /> }
+        { updatesAvailable && <UpdatesAvailableAlert cv={cv} /> }
         <div className="co-detail-table">
           <div className="co-detail-table__row row">
             <div className="co-detail-table__section">
@@ -269,3 +257,20 @@ type ClusterVersionDetailsTableProps = {
 type ClusterSettingsPageProps = {
   match: any;
 };
+
+type UpdateFailingAlertProps = {
+  condition: ClusterVersionCondition;
+  updatesAvailable: boolean;
+};
+
+type RetrieveUpdatesFailedAlertProps = {
+  condition: ClusterVersionCondition;
+};
+
+type UpdateInProgressAlertProps = {
+  condition: ClusterVersionCondition;
+};
+
+type UpdatesAvailableAlertProps = {
+  cv: ClusterVersionKind;
+};
diff --git a/frontend/public/components/cluster-settings/global-config.tsx b/frontend/public/components/cluster-settings/global-config.tsx
index 484b08d2096..f7b42afd077 100644
--- a/frontend/public/components/cluster-settings/global-config.tsx
+++ b/frontend/public/components/cluster-settings/global-config.tsx
@@ -33,13 +33,13 @@ class GlobalConfigPage_ extends React.Component<GlobalConfigPageProps, GlobalCon
 
   componentDidMount() {
     let errorMessage = '';
-    Promise.all(this.props.configResources.map(model => {
-      return k8sList(model, { fieldSelector: 'metadata.name=cluster' })
+    Promise.all(this.props.configResources.map((model: K8sKind) => {
+      return k8sList(model)
         .catch(err => {
           errorMessage += `${err.message} `;
           this.setState({ errorMessage });
           return [];
-        }).then(items => items.map(i => ({...i, model})));
+        }).then(items => items.map((i: K8sKind) => ({...i, model})));
     })).then((responses) => {
       const items = _.sortBy(_.flatten(responses), 'kind', 'asc');
       this.setState({
diff --git a/frontend/public/components/cluster-settings/htpasswd-idp-form.tsx b/frontend/public/components/cluster-settings/htpasswd-idp-form.tsx
new file mode 100644
index 00000000000..c6a6e2fe353
--- /dev/null
+++ b/frontend/public/components/cluster-settings/htpasswd-idp-form.tsx
@@ -0,0 +1,190 @@
+/* eslint-disable no-undef, no-unused-vars */
+
+import * as React from 'react';
+import * as _ from 'lodash-es';
+import { Helmet } from 'react-helmet';
+
+import { OAuthModel, SecretModel } from '../../models';
+import { k8sCreate, k8sGet, k8sPatch, K8sResourceKind, referenceFor } from '../../module/k8s';
+import {
+  AsyncComponent,
+  ButtonBar,
+  Dropdown,
+  PromiseComponent,
+  history,
+  resourceObjPath,
+} from '../utils';
+
+// The name of the cluster-scoped OAuth configuration resource.
+const oauthResourceName = 'cluster';
+
+const DroppableFileInput = (props) => <AsyncComponent loader={() => import('../utils/file-input').then(c => c.DroppableFileInput)} {...props} />;
+
+export class AddHTPasswdPage extends PromiseComponent {
+  readonly state: AddHTPasswdPageState = {
+    name: 'htpasswd',
+    challenge: true,
+    login: true,
+    mappingMethod: 'claim',
+    htpasswdFileContent: '',
+    inProgress: false,
+    errorMessage: '',
+  }
+
+  getOAuthResource(): Promise<K8sResourceKind> {
+    return this.handlePromise(k8sGet(OAuthModel, oauthResourceName));
+  }
+
+  createHTPasswdSecret(): Promise<K8sResourceKind> {
+    const secret = {
+      apiVersion: 'v1',
+      kind: 'Secret',
+      metadata: {
+        generateName: 'htpasswd-',
+        namespace: 'openshift-config',
+      },
+      stringData: {
+        htpasswd: this.state.htpasswdFileContent,
+      },
+    };
+
+    return this.handlePromise(k8sCreate(SecretModel, secret));
+  }
+
+  addHTPasswdIDP(oauth: K8sResourceKind, secretName: string): Promise<K8sResourceKind> {
+    const { name, challenge, login, mappingMethod } = this.state;
+    const htpasswd = {
+      name,
+      type: 'HTPasswd',
+      challenge,
+      login,
+      mappingMethod,
+      htpasswd: {
+        fileData: {
+          name: secretName,
+        },
+      },
+    };
+
+    const patch = _.isEmpty(oauth.spec.identityProviders)
+      ? { op: 'add', path: '/spec/identityProviders', value: [htpasswd] }
+      : { op: 'add', path: '/spec/identityProviders/-', value: htpasswd };
+    return this.handlePromise(k8sPatch(OAuthModel, oauth, [patch]));
+  }
+
+  submit: React.FormEventHandler<HTMLFormElement> = (e) => {
+    e.preventDefault();
+    if (!this.state.htpasswdFileContent) {
+      this.setState({errorMessage: 'You must specify an HTPasswd file.'});
+      return;
+    }
+
+    // Clear any previous errors.
+    this.setState({errorMessage: ''});
+    this.getOAuthResource().then((oauth: K8sResourceKind) => {
+      return this.createHTPasswdSecret()
+        .then((secret: K8sResourceKind) => this.addHTPasswdIDP(oauth, secret.metadata.name))
+        .then(() => {
+          history.push(resourceObjPath(oauth, referenceFor(oauth)));
+        });
+    });
+  }
+
+  nameChanged: React.ReactEventHandler<HTMLInputElement> = (e) => {
+    this.setState({name: e.currentTarget.value});
+  };
+
+  loginChanged: React.ReactEventHandler<HTMLInputElement> = event => {
+    this.setState({login: event.currentTarget.checked});
+  }
+
+  challengeChanged: React.ReactEventHandler<HTMLInputElement> = event => {
+    this.setState({challenge: event.currentTarget.checked});
+  }
+
+  mappingMethodChanged = (mappingMethod: string) => {
+    this.setState({mappingMethod});
+  }
+
+  htpasswdFileChanged = (htpasswdFileContent: string) => {
+    this.setState({htpasswdFileContent});
+  };
+
+  render() {
+    const { name, login, challenge, mappingMethod, htpasswdFileContent } = this.state;
+    const title = 'Add Identity Provider: HTPasswd';
+    const mappingMethods = {
+      'claim': 'Claim',
+      'lookup': 'Lookup',
+      'add': 'Add',
+    };
+    return <div className="co-m-pane__body">
+      <Helmet>
+        <title>{title}</title>
+      </Helmet>
+      <form onSubmit={this.submit} name="form" className="co-m-pane__body-group co-m-pane__form">
+        <h1 className="co-m-pane__heading">{title}</h1>
+        <p className="co-m-pane__explanation">
+          HTPasswd validates usernames and passwords against a flat file generated using the htpasswd command.
+        </p>
+        <div className="form-group">
+          <label className="control-label co-required" htmlFor="idp-name">Name</label>
+          <input className="form-control"
+            type="text"
+            onChange={this.nameChanged}
+            value={name}
+            aria-describedby="idp-name-help"
+            id="idp-name"
+            required />
+          <p className="help-block" id="idp-name-help">
+            Unique name of the new identity provider. This cannot be changed later.
+          </p>
+        </div>
+        <div className="checkbox">
+          <label className="control-label">
+            <input type="checkbox" onChange={this.loginChanged} checked={login} />
+            Use this identity provider for browser login
+          </label>
+        </div>
+        <div className="checkbox">
+          <label className="control-label">
+            <input type="checkbox" onChange={this.challengeChanged} checked={challenge} />
+            Issue <code>WWW-Authenticate</code> challenges to non-browser clients
+          </label>
+        </div>
+        <div className="form-group">
+          <label className="control-label co-required" htmlFor="tag">Mapping Method</label>
+          <Dropdown dropDownClassName="dropdown--full-width" items={mappingMethods} selectedKey={mappingMethod} title={mappingMethods[mappingMethod]} onChange={this.mappingMethodChanged} />
+          <div className="help-block" id="mapping-method-description">
+            { /* TODO: Add doc link when available in 4.0 docs. */ }
+            Specifies how new identities are mapped to users when they log in.
+          </div>
+        </div>
+        <div className="form-group">
+          <DroppableFileInput
+            onChange={this.htpasswdFileChanged}
+            inputFileData={htpasswdFileContent}
+            id="htpasswd-file"
+            label="HTPasswd File"
+            inputFieldHelpText="Upload an HTPasswd file created using the htpasswd command."
+            isRequired
+            hideContents />
+        </div>
+        <ButtonBar errorMessage={this.state.errorMessage} inProgress={this.state.inProgress}>
+          <button type="submit" className="btn btn-primary">Add</button>
+          <button type="button" className="btn btn-default" onClick={history.goBack}>Cancel</button>
+        </ButtonBar>
+      </form>
+    </div>;
+  }
+}
+
+type AddHTPasswdPageState = {
+  name: string;
+  login: boolean;
+  challenge: boolean;
+  mappingMethod: string;
+  htpasswdFileContent: string;
+  inProgress: boolean;
+  errorMessage: string;
+};
diff --git a/frontend/public/components/cluster-settings/oauth.tsx b/frontend/public/components/cluster-settings/oauth.tsx
index bea1c52a217..0e3ae64d0c7 100644
--- a/frontend/public/components/cluster-settings/oauth.tsx
+++ b/frontend/public/components/cluster-settings/oauth.tsx
@@ -6,11 +6,13 @@ import { OAuthModel } from '../../models';
 import { K8sResourceKind, referenceForModel } from '../../module/k8s';
 import { DetailsPage } from '../factory';
 import {
+  Dropdown,
   EmptyBox,
   Kebab,
-  navFactory,
-  SectionHeading,
   ResourceSummary,
+  SectionHeading,
+  history,
+  navFactory,
 } from '../utils';
 import { formatDuration } from '../utils/datetime';
 
@@ -51,19 +53,28 @@ const IdentityProviders: React.SFC<IdentityProvidersProps> = ({identityProviders
 
 const OAuthDetails: React.SFC<OAuthDetailsProps> = ({obj}: {obj: K8sResourceKind}) => {
   const { identityProviders, tokenConfig = {} } = obj.spec;
+  const addIDPItems = {
+    htpasswd: 'HTPasswd',
+  };
   return <React.Fragment>
     <div className="co-m-pane__body">
       <SectionHeading text="OAuth Overview" />
-      <ResourceSummary resource={obj} showPodSelector={false} showNodeSelector={false}>
+      <ResourceSummary resource={obj}>
         <dt>Access Token Max Age</dt>
         <dd>{tokenDuration(tokenConfig.accessTokenMaxAgeSeconds)}</dd>
       </ResourceSummary>
     </div>
     <div className="co-m-pane__body">
       <SectionHeading text="Identity Providers" />
-      <p className="co-m-pane__explanation">
+      <p className="co-m-pane__explanation co-m-pane__explanation--alt">
         Identity providers determine how users log into the cluster.
       </p>
+      <Dropdown
+        className="co-m-pane__dropdown"
+        buttonClassName="btn-primary"
+        title="Add"
+        noSelection={true}
+        items={addIDPItems} onChange={(name) => history.push(`/settings/idp/${name}`)} />
       <IdentityProviders identityProviders={identityProviders} />
     </div>
   </React.Fragment>;
diff --git a/frontend/public/components/configmap-and-secret-data.jsx b/frontend/public/components/configmap-and-secret-data.jsx
index 924348afb6b..238fca61361 100644
--- a/frontend/public/components/configmap-and-secret-data.jsx
+++ b/frontend/public/components/configmap-and-secret-data.jsx
@@ -1,8 +1,10 @@
 import * as React from 'react';
 import * as PropTypes from 'prop-types';
+import { Base64 } from 'js-base64';
 
 import { CopyToClipboard, EmptyBox, SectionHeading } from './utils';
 
+
 export const MaskedData = () => <React.Fragment>
   <span className="sr-only">Value hidden</span>
   <span aria-hidden="true">&bull;&bull;&bull;&bull;&bull;</span>
@@ -35,7 +37,7 @@ export class SecretData extends React.PureComponent {
     }
 
     const { showSecret } = this.state;
-    const decodedValue = window.atob(rawValue);
+    const decodedValue = Base64.decode(rawValue);
     const visibleValue = showSecret ? decodedValue : <MaskedData />;
     return <CopyToClipboard value={decodedValue} visibleValue={visibleValue} />;
   }
diff --git a/frontend/public/components/configmap.jsx b/frontend/public/components/configmap.jsx
index bfc095cbb3c..323f0a032ee 100644
--- a/frontend/public/components/configmap.jsx
+++ b/frontend/public/components/configmap.jsx
@@ -33,7 +33,7 @@ const ConfigMapDetails = ({obj: configMap}) => {
   return <React.Fragment>
     <div className="co-m-pane__body">
       <SectionHeading text="Config Map Overview" />
-      <ResourceSummary resource={configMap} showPodSelector={false} showNodeSelector={false} />
+      <ResourceSummary resource={configMap} />
     </div>
     <div className="co-m-pane__body">
       <SectionHeading text="Data" />
diff --git a/frontend/public/components/cron-job.jsx b/frontend/public/components/cron-job.jsx
index d3f788e1b57..51bfcd8aa52 100644
--- a/frontend/public/components/cron-job.jsx
+++ b/frontend/public/components/cron-job.jsx
@@ -45,7 +45,7 @@ const Details = ({obj: cronjob}) => {
       <div className="row">
         <div className="col-md-6">
           <SectionHeading text="CronJob Overview" />
-          <ResourceSummary resource={cronjob} showNodeSelector={false} showPodSelector={false} showAnnotations={false}>
+          <ResourceSummary resource={cronjob}>
             <dt>Schedule</dt>
             <dd>{cronjob.spec.schedule}</dd>
             <dt>Concurrency Policy</dt>
diff --git a/frontend/public/components/custom-resource-definition.tsx b/frontend/public/components/custom-resource-definition.tsx
index 57784e5213f..858a8ebf7e3 100644
--- a/frontend/public/components/custom-resource-definition.tsx
+++ b/frontend/public/components/custom-resource-definition.tsx
@@ -1,13 +1,22 @@
 import * as _ from 'lodash-es';
 import * as React from 'react';
-import { Link } from 'react-router-dom';
 
-import { ColHead, List, ListHeader, ListPage } from './factory';
-import { Kebab, ResourceKebab, ResourceIcon } from './utils';
+import { ColHead, DetailsPage, List, ListHeader, ListPage } from './factory';
+import { Kebab, navFactory, ResourceKebab, ResourceLink, ResourceSummary, SectionHeading } from './utils';
 import { referenceForCRD } from '../module/k8s';
 
 const { common } = Kebab.factory;
-const menuActions = [...common];
+
+const crdInstancesPath = crd => _.get(crd, 'spec.scope') === 'Namespaced'
+  ? `/k8s/all-namespaces/${referenceForCRD(crd)}`
+  : `/k8s/cluster/${referenceForCRD(crd)}`;
+
+const instances = (kind, obj) => ({
+  label: 'View Instances',
+  href: crdInstancesPath(obj),
+});
+
+const menuActions = [instances, ...common];
 
 const CRDHeader = props => <ListHeader>
   <ColHead {...props} className="col-lg-3 col-md-4 col-sm-4 col-xs-6" sortField="spec.names.kind">Name</ColHead>
@@ -27,8 +36,7 @@ const namespaced = crd => crd.spec.scope === 'Namespaced';
 const CRDRow = ({obj: crd}) => <div className="row co-resource-list__item">
   <div className="col-lg-3 col-md-4 col-sm-4 col-xs-6">
     <span className="co-resource-link">
-      <ResourceIcon kind="CustomResourceDefinition" />
-      <Link className="co-resource-link__resource-name" to={`/k8s/all-namespaces/${referenceForCRD(crd)}`}>{_.get(crd, 'spec.names.kind', crd.metadata.name)}</Link>
+      <ResourceLink kind="CustomResourceDefinition" name={crd.metadata.name} namespace={crd.metadata.namespace} displayName={_.get(crd, 'spec.names.kind')} />
     </span>
   </div>
   <div className="col-lg-3 col-md-4 col-sm-4 col-xs-6 co-break-word">
@@ -52,8 +60,16 @@ const CRDRow = ({obj: crd}) => <div className="row co-resource-list__item">
   </div>
 </div>;
 
+const Details = ({obj: crd}) => {
+  return <div className="co-m-pane__body">
+    <SectionHeading text="Custom Resource Definition Overview" />
+    <ResourceSummary showPodSelector={false} showNodeSelector={false} resource={crd} />
+  </div>;
+};
+
 export const CustomResourceDefinitionsList: React.SFC<CustomResourceDefinitionsListProps> = props => <List {...props} Header={CRDHeader} Row={CRDRow} />;
 export const CustomResourceDefinitionsPage: React.SFC<CustomResourceDefinitionsPageProps> = props => <ListPage {...props} ListComponent={CustomResourceDefinitionsList} kind="CustomResourceDefinition" canCreate={true} filterLabel="CRDs by name" />;
+export const CustomResourceDefinitionsDetailsPage = props => <DetailsPage {...props} menuActions={menuActions} pages={[navFactory.details(Details), navFactory.editYaml()]} />;
 
 export type CustomResourceDefinitionsListProps = {
 
diff --git a/frontend/public/components/daemon-set.jsx b/frontend/public/components/daemon-set.jsx
index 99432b4244e..d264f26f16a 100644
--- a/frontend/public/components/daemon-set.jsx
+++ b/frontend/public/components/daemon-set.jsx
@@ -70,7 +70,7 @@ const Details = ({obj: daemonset}) => <React.Fragment>
     <SectionHeading text="Daemon Set Overview" />
     <div className="row">
       <div className="col-lg-6">
-        <ResourceSummary resource={daemonset} />
+        <ResourceSummary resource={daemonset} showPodSelector showNodeSelector />
       </div>
       <div className="col-lg-6">
         <DaemonSetDetailsList ds={daemonset} />
diff --git a/frontend/public/components/deployment-config.tsx b/frontend/public/components/deployment-config.tsx
index f28c97b1678..972002da3de 100644
--- a/frontend/public/components/deployment-config.tsx
+++ b/frontend/public/components/deployment-config.tsx
@@ -110,7 +110,7 @@ export const DeploymentConfigsDetails: React.SFC<{obj: any}> = ({obj: dc}) => {
       <div className="co-m-pane__body-group">
         <div className="row">
           <div className="col-sm-6">
-            <ResourceSummary resource={dc}>
+            <ResourceSummary resource={dc} showPodSelector showNodeSelector>
               <dt>Status</dt>
               <dd>{dc.status.availableReplicas === dc.status.updatedReplicas ? <StatusIcon status="Active" /> : <StatusIcon status="Updating" />}</dd>
             </ResourceSummary>
diff --git a/frontend/public/components/deployment.jsx b/frontend/public/components/deployment.jsx
index a7043971203..5baf822d41a 100644
--- a/frontend/public/components/deployment.jsx
+++ b/frontend/public/components/deployment.jsx
@@ -74,7 +74,7 @@ const DeploymentDetails = ({obj: deployment}) => {
       <div className="co-m-pane__body-group">
         <div className="row">
           <div className="col-sm-6">
-            <ResourceSummary resource={deployment}>
+            <ResourceSummary resource={deployment} showPodSelector showNodeSelector>
               <dt>Status</dt>
               <dd>{deployment.status.availableReplicas === deployment.status.updatedReplicas ? <StatusIcon status="Active" /> : <StatusIcon status="Updating" />}</dd>
             </ResourceSummary>
diff --git a/frontend/public/components/factory/list.tsx b/frontend/public/components/factory/list.tsx
index af95e45bb9b..987ddc47e3b 100644
--- a/frontend/public/components/factory/list.tsx
+++ b/frontend/public/components/factory/list.tsx
@@ -48,6 +48,7 @@ import {
   serviceCatalogStatus,
   serviceClassDisplayName,
   getClusterOperatorStatus,
+  getClusterOperatorVersion,
 } from '../../module/k8s';
 
 const fuzzyCaseInsensitive = (a, b) => fuzzy(_.toLower(a), _.toLower(b));
@@ -236,6 +237,7 @@ const sorts = {
   silenceStateOrder,
   string: val => JSON.stringify(val),
   getClusterOperatorStatus,
+  getClusterOperatorVersion,
 };
 
 export class ColHead extends React.Component<ColHeadProps> {
diff --git a/frontend/public/components/graphs/_graphs.scss b/frontend/public/components/graphs/_graphs.scss
index 3bf1a3b9332..689efd69ab7 100644
--- a/frontend/public/components/graphs/_graphs.scss
+++ b/frontend/public/components/graphs/_graphs.scss
@@ -14,3 +14,43 @@
   white-space: nowrap;
   line-height: 1.4; // so descenders don't clip
 }
+
+.query-browser__wrapper {
+  border: 1px solid $color-grey-background-border;
+  margin: 0 0 20px 0;
+  overflow: visible;
+  width: 100%;
+}
+
+.query-browser__header {
+  display: inline-flex;
+  justify-content: space-between;
+  padding: 15px 10px 10px 10px;
+  width: 100%;
+}
+
+.query-browser__controls {
+  display: inline-flex;
+}
+
+.query-browser__span-text {
+  border-bottom-right-radius: 0;
+  border-right: none;
+  border-top-right-radius: 0;
+  width: 100px;
+}
+
+.query-browser__span-text--error {
+  background-color: #fdd;
+}
+
+.query-browser__span-dropdown {
+  border-bottom-left-radius: 0;
+  border-top-left-radius: 0;
+  margin-right: 20px;
+  width: 30px;
+}
+
+.query-browser__span-reset {
+  margin-right: 20px;
+}
diff --git a/frontend/public/components/graphs/base.jsx b/frontend/public/components/graphs/base.jsx
index 6c401051c7e..84b7506e85a 100644
--- a/frontend/public/components/graphs/base.jsx
+++ b/frontend/public/components/graphs/base.jsx
@@ -32,7 +32,7 @@ export class BaseGraph extends SafetyFirst {
     }
   }
 
-  fetch() {
+  fetch(enablePolling = true) {
     const timeSpan = this.end - this.start || this.timeSpan;
     const end = this.end || Date.now();
     const start = this.start || (end - timeSpan);
@@ -45,8 +45,8 @@ export class BaseGraph extends SafetyFirst {
     }
 
     const basePath = this.props.basePath || (this.props.namespace ? prometheusTenancyBasePath : prometheusBasePath);
-    const pollInterval = timeSpan / 120 || 15000;
-    const stepSize = pollInterval / 1000;
+    const pollInterval = timeSpan ? Math.max(timeSpan / 120, 5000) : 15000;
+    const stepSize = (timeSpan && this.props.numSamples ? timeSpan / this.props.numSamples : pollInterval) / 1000;
     const promises = queries.map(q => {
       const nsParam = this.props.namespace ? `&namespace=${encodeURIComponent(this.props.namespace)}` : '';
       const url = this.timeSpan
@@ -64,11 +64,15 @@ export class BaseGraph extends SafetyFirst {
         }
       })
       .catch(error => this.updateGraph(null, error))
-      .then(() => this.interval = setTimeout(() => {
-        if (this.isMounted_) {
-          this.fetch();
+      .then(() => {
+        if (enablePolling) {
+          this.interval = setTimeout(() => {
+            if (this.isMounted_) {
+              this.fetch();
+            }
+          }, pollInterval);
         }
-      }, pollInterval));
+      });
   }
 
   componentWillMount() {
@@ -132,7 +136,7 @@ export class BaseGraph extends SafetyFirst {
     const { title, className } = this.props;
     const url = this.props.query ? this.prometheusURL() : null;
     const graph = <div className={classNames('graph-wrapper', className)} style={this.style}>
-      <h5 className="graph-title">{title}</h5>
+      {title && <h5 className="graph-title">{title}</h5>}
       <div ref={this.setNode} style={{width: '100%'}} />
     </div>;
 
@@ -154,7 +158,8 @@ BaseGraph.propTypes = {
   ]),
   percent: PropTypes.number, // for gauge charts
   className: PropTypes.string,
-  title: PropTypes.string.isRequired,
+  numSamples: PropTypes.number,
+  title: PropTypes.string,
   timeSpan: PropTypes.number,
   basePath: PropTypes.string,
 };
diff --git a/frontend/public/components/graphs/gauge.jsx b/frontend/public/components/graphs/gauge.jsx
index b5b75afac3f..299e1cc0c51 100644
--- a/frontend/public/components/graphs/gauge.jsx
+++ b/frontend/public/components/graphs/gauge.jsx
@@ -47,8 +47,8 @@ class Gauge_ extends BaseGraph {
         pad: 10,
       },
       annotations: [{
-        x: 0,
-        y: -0.05,
+        x: 0.5,
+        y: 0.5,
         text: '...',
         showarrow: false,
         ax: 0,
diff --git a/frontend/public/components/graphs/graph-loader.jsx b/frontend/public/components/graphs/graph-loader.jsx
index 07892936db2..638e659e037 100644
--- a/frontend/public/components/graphs/graph-loader.jsx
+++ b/frontend/public/components/graphs/graph-loader.jsx
@@ -1,5 +1,6 @@
 export { Bar } from './bar';
 export { Gauge } from './gauge';
 export { Line } from './line';
+export { QueryBrowser } from './query-browser';
 export { Scalar } from './scalar';
 export { Donut } from './donut';
diff --git a/frontend/public/components/graphs/health.jsx b/frontend/public/components/graphs/health.jsx
index 85130c29702..15587643229 100644
--- a/frontend/public/components/graphs/health.jsx
+++ b/frontend/public/components/graphs/health.jsx
@@ -1,7 +1,9 @@
 import * as React from 'react';
+import { connect } from 'react-redux';
 
 import { Status, errorStatus } from './';
 import { coFetch, coFetchJSON } from '../../co-fetch';
+import { FLAGS, featureReducerName } from '../../features';
 import { k8sBasePath } from '../../module/k8s';
 
 // Use the shorter 'OpenShift Console' instead of 'OpenShift Container Platform Console' since the title appears in the chart.
@@ -25,15 +27,19 @@ export const KubernetesHealth = () => <Status title="Kubernetes API" fetch={fetc
 
 export const ConsoleHealth = () => <Status title={consoleName} fetch={fetchConsoleHealth} />;
 
-const AlertsFiring = ({namespace}) => (
-  <Status
+const alertsFiringStateToProps = (state) => ({canAccessMonitoring: !!state[featureReducerName].get(FLAGS.CAN_GET_NS)});
+
+const AlertsFiring_ = ({canAccessMonitoring, namespace}) => {
+  const toProp = canAccessMonitoring && !!window.SERVER_FLAGS.prometheusBaseURL ? {to: '/monitoring'} : {};
+  return <Status
+    {...toProp}
     title="Alerts Firing"
     name="Alerts"
     namespace={namespace}
     query={`sum(ALERTS{alertstate="firing", alertname!="Watchdog" ${namespace ? `, namespace="${namespace}"` : ''}})`}
-    to="/monitoring"
-  />
-);
+  />;
+};
+const AlertsFiring = connect(alertsFiringStateToProps)(AlertsFiring_);
 
 const CrashloopingPods = ({namespace}) => (
   <Status
diff --git a/frontend/public/components/graphs/index.jsx b/frontend/public/components/graphs/index.jsx
index 6ace8d1623d..262e917c3e8 100644
--- a/frontend/public/components/graphs/index.jsx
+++ b/frontend/public/components/graphs/index.jsx
@@ -9,6 +9,7 @@ export const prometheusBasePath = window.SERVER_FLAGS.prometheusBaseURL;
 export const prometheusTenancyBasePath = window.SERVER_FLAGS.prometheusTenancyBaseURL;
 export const alertManagerBasePath = window.SERVER_FLAGS.alertManagerBaseURL;
 
+export const QueryBrowser = props => <AsyncComponent loader={() => import('./graph-loader').then(c => c.QueryBrowser)} {...props} />;
 export const Bar = props => <AsyncComponent loader={() => import('./graph-loader').then(c => c.Bar)} {...props} />;
 export const Gauge = props => <AsyncComponent loader={() => import('./graph-loader').then(c => c.Gauge)} {...props} />;
 export const Line = props => <AsyncComponent loader={() => import('./graph-loader').then(c => c.Line)} {...props} />;
diff --git a/frontend/public/components/graphs/query-browser.jsx b/frontend/public/components/graphs/query-browser.jsx
new file mode 100644
index 00000000000..89f02eea8f8
--- /dev/null
+++ b/frontend/public/components/graphs/query-browser.jsx
@@ -0,0 +1,174 @@
+import * as React from 'react';
+import * as _ from 'lodash-es';
+import * as classNames from 'classnames';
+import { addTraces, relayout, restyle } from 'plotly.js/lib/core';
+
+import { connectToURLs, MonitoringRoutes } from '../../monitoring';
+import { Dropdown, ExternalLink, LoadingInline } from '../utils';
+import { formatPrometheusDuration, parsePrometheusDuration } from '../utils/datetime';
+import { Line_ } from './line';
+
+const spans = ['5m', '15m', '30m', '1h', '2h', '6h', '12h', '1d', '2d', '1w', '2w'];
+const dropdownItems = _.zipObject(spans, spans);
+
+class QueryBrowser_ extends Line_ {
+  constructor(props) {
+    super(props);
+
+    _.assign(this.state, {
+      isSpanValid: true,
+      spanText: formatPrometheusDuration(props.timeSpan),
+      span: props.timeSpan,
+      updating: true,
+    });
+
+    this.data = [{}];
+    this.traces = [0];
+
+    _.merge(this.layout, {
+      dragmode: 'zoom',
+      height: 200,
+      hoverlabel: {
+        namelength: 80,
+      },
+      showlegend: false,
+      xaxis: {
+        fixedrange: false,
+        tickformat: null, // Use Plotly's default datetime labels
+        type: 'date',
+      },
+    });
+
+    this.onPlotlyRelayout = e => {
+      if (e['xaxis.autorange']) {
+        this.showLatest(this.state.span);
+      } else {
+        const start = e['xaxis.range[0]'];
+        const end = e['xaxis.range[1]'];
+        if (start && end) {
+          // Zoom to a specific graph time range
+          this.start = new Date(start).getTime();
+          this.end = new Date(end).getTime();
+          const span = this.end - this.start;
+          this.timeSpan = span;
+          this.setState({isSpanValid: true, span, spanText: formatPrometheusDuration(span), updating: true}, () => {
+            clearInterval(this.interval);
+
+            // Refresh the graph data, but stop polling, since we are no longer displaying the latest data
+            this.fetch(false);
+          });
+        }
+      }
+    };
+
+    this.relayout = () => {
+      const now = new Date();
+      const end = this.end || now;
+      const start = this.start || new Date(end - this.state.span);
+      // eslint-disable-next-line no-console
+      relayout(this.node, {'xaxis.range': [start, end]}).catch(e => console.error(e));
+    };
+
+    this.showLatest = span => {
+      this.start = null;
+      this.end = null;
+      this.timeSpan = span;
+      this.setState({isSpanValid: true, span, spanText: formatPrometheusDuration(span), updating: true}, () => {
+        clearInterval(this.interval);
+        this.fetch();
+        this.relayout();
+      });
+    };
+
+    this.onSpanTextChange = e => {
+      const spanText = e.target.value;
+      const span = parsePrometheusDuration(spanText);
+      const isSpanValid = (span > 0);
+      if (isSpanValid) {
+        this.showLatest(span);
+      }
+      this.setState({isSpanValid, spanText});
+    };
+  }
+
+  updateGraph(data) {
+    const newData = _.get(data, '[0].data.result');
+    if (!_.isEmpty(newData)) {
+      this.data = newData;
+      let traceIndex = 0;
+      _.each(newData, ({metric, values}) => {
+        // If props.metric is specified, ignore all other metrics
+        const labels = _.omit(metric, '__name__');
+        if (this.props.metric && _.some(labels, (v, k) => _.get(this.props.metric, k) !== v)) {
+          return;
+        }
+
+        // The data may have missing values, so we fill those gaps with nulls so that the graph correctly shows the
+        // missing values as gaps in the line
+        const start = values[0][0];
+        const end = _.last(values)[0];
+        const step = this.state.span / this.props.numSamples / 1000;
+        _.range(start, end, step).map((t, i) => {
+          if (_.get(values, [i, 0]) > t) {
+            values.splice(i, 0, [t, null]);
+          }
+        });
+
+        const update = {
+          line: {
+            width: 1,
+          },
+          name: _.map(labels, (v, k) => `${k}=${v}`).join(','),
+          x: [values.map(v => new Date(v[0] * 1000))],
+          y: [values.map(v => v[1])],
+        };
+
+        if (!this.traces.includes(traceIndex)) {
+          // eslint-disable-next-line no-console
+          addTraces(this.node, update, traceIndex).catch(e => console.error(e));
+          this.traces.push(traceIndex);
+        }
+        // eslint-disable-next-line no-console
+        restyle(this.node, update, [traceIndex]).catch(e => console.error(e));
+        traceIndex += 1;
+      });
+
+      this.relayout();
+    }
+    this.setState({updating: false});
+  }
+
+  render() {
+    const {query, timeSpan, urls} = this.props;
+    const {spanText, isSpanValid, updating} = this.state;
+    const baseUrl = urls[MonitoringRoutes.Prometheus];
+
+    return <div className="query-browser__wrapper">
+      <div className="query-browser__header">
+        <div className="query-browser__controls">
+          <input
+            className={classNames('form-control query-browser__span-text', {'query-browser__span-text--error': !isSpanValid})}
+            onChange={this.onSpanTextChange}
+            type="text"
+            value={spanText}
+          />
+          <Dropdown
+            buttonClassName="btn-default form-control query-browser__span-dropdown"
+            items={dropdownItems}
+            noSelection={true}
+            onChange={v => this.showLatest(parsePrometheusDuration(v))}
+          />
+          <button
+            className="btn btn-default query-browser__span-reset"
+            onClick={() => this.showLatest(timeSpan)}
+            type="button"
+          >Reset Zoom</button>
+          {updating && <LoadingInline />}
+        </div>
+        {baseUrl && query && <ExternalLink href={`${baseUrl}/graph?g0.expr=${encodeURIComponent(query)}&g0.tab=0`} text="View in Prometheus UI" />}
+      </div>
+      <div ref={this.setNode} style={{width: '100%'}} />
+    </div>;
+  }
+}
+export const QueryBrowser = connectToURLs(MonitoringRoutes.Prometheus)(QueryBrowser_);
diff --git a/frontend/public/components/hpa.tsx b/frontend/public/components/hpa.tsx
index e5d0599c81a..5e54e224ec1 100644
--- a/frontend/public/components/hpa.tsx
+++ b/frontend/public/components/hpa.tsx
@@ -131,7 +131,7 @@ export const HorizontalPodAutoscalersDetails: React.SFC<HorizontalPodAutoscalers
     <SectionHeading text="Horizontal Pod Autoscaler Overview" />
     <div className="row">
       <div className="col-sm-6">
-        <ResourceSummary resource={hpa} showPodSelector={false} showNodeSelector={false} />
+        <ResourceSummary resource={hpa} />
       </div>
       <div className="col-sm-6">
         <dl className="co-m-pane__details">
diff --git a/frontend/public/components/image-stream-tag.tsx b/frontend/public/components/image-stream-tag.tsx
index 8fb2b383445..ec669682f4e 100644
--- a/frontend/public/components/image-stream-tag.tsx
+++ b/frontend/public/components/image-stream-tag.tsx
@@ -47,7 +47,7 @@ export const ImageStreamTagsDetails: React.SFC<ImageStreamTagsDetailsProps> = ({
       <div className="row">
         <div className="col-md-6 col-sm-12">
           <SectionHeading text="Image Overview" />
-          <ResourceSummary resource={imageStreamTag} showPodSelector={false} showNodeSelector={false}>
+          <ResourceSummary resource={imageStreamTag}>
             {labels.name && <dt>Image Name</dt>}
             {labels.name && <dd>{labels.name}</dd>}
             {labels.summary && <dt>Summary</dt>}
diff --git a/frontend/public/components/image-stream.tsx b/frontend/public/components/image-stream.tsx
index 2a76182468e..09771a6ff4c 100644
--- a/frontend/public/components/image-stream.tsx
+++ b/frontend/public/components/image-stream.tsx
@@ -116,7 +116,7 @@ export const ImageStreamsDetails: React.SFC<ImageStreamsDetailsProps> = ({obj: i
   return <div>
     <div className="co-m-pane__body">
       <SectionHeading text="Image Stream Overview" />
-      <ResourceSummary resource={imageStream} showPodSelector={false} showNodeSelector={false}>
+      <ResourceSummary resource={imageStream}>
         {imageRepository && <dt>Image Repository</dt>}
         {imageRepository && <dd>{imageRepository}</dd>}
         {publicImageRepository && <dt>Public Image Repository</dt>}
diff --git a/frontend/public/components/ingress.jsx b/frontend/public/components/ingress.jsx
index a3826176685..f6b38d668a0 100644
--- a/frontend/public/components/ingress.jsx
+++ b/frontend/public/components/ingress.jsx
@@ -118,7 +118,7 @@ const RulesRows = (props) => {
 const Details = ({obj: ingress}) => <React.Fragment>
   <div className="co-m-pane__body">
     <SectionHeading text="Ingress Overview" />
-    <ResourceSummary resource={ingress} showPodSelector={false} showNodeSelector={false}>
+    <ResourceSummary resource={ingress}>
       <dt>TLS Certificate</dt>
       <dd>{getTLSCert(ingress)}</dd>
     </ResourceSummary>
diff --git a/frontend/public/components/job.jsx b/frontend/public/components/job.jsx
index a5c97807f71..13f8e14318a 100644
--- a/frontend/public/components/job.jsx
+++ b/frontend/public/components/job.jsx
@@ -57,7 +57,7 @@ const Details = ({obj: job}) => <React.Fragment>
     <div className="row">
       <div className="col-md-6">
         <SectionHeading text="Job Overview" />
-        <ResourceSummary resource={job} showNodeSelector={false}>
+        <ResourceSummary resource={job} showPodSelector>
           <dt>Desired Completions</dt>
           <dd>{job.spec.completions || '-'}</dd>
           <dt>Parallelism</dt>
diff --git a/frontend/public/components/limit-range.tsx b/frontend/public/components/limit-range.tsx
index 8be4fe1b7d4..70168250b1a 100644
--- a/frontend/public/components/limit-range.tsx
+++ b/frontend/public/components/limit-range.tsx
@@ -101,7 +101,7 @@ export const LimitRangeDetailsList = (resource) => {
 const Details = ({obj: rq}) => <React.Fragment>
   <div className="co-m-pane__body">
     <SectionHeading text="Limit Range Overview" />
-    <ResourceSummary resource={rq} showPodSelector={false} showNodeSelector={false} />
+    <ResourceSummary resource={rq} />
   </div>
   <LimitRangeDetailsList resource={rq} />
 </React.Fragment>;
diff --git a/frontend/public/components/machine-config-pool.tsx b/frontend/public/components/machine-config-pool.tsx
index 9779d7cc20c..4bd20b91ae4 100644
--- a/frontend/public/components/machine-config-pool.tsx
+++ b/frontend/public/components/machine-config-pool.tsx
@@ -131,7 +131,7 @@ const MachineConfigPoolCounts: React.SFC<MachineConfigPoolCountsProps> = ({obj})
 const MachineConfigPoolSummary: React.SFC<MachineConfigPoolSummaryProps> = ({obj}) => {
   const machineConfigSelector = _.get(obj, 'spec.machineConfigSelector');
   const machineSelector = _.get(obj, 'spec.machineSelector');
-  return <ResourceSummary resource={obj} showPodSelector={false} showNodeSelector={false}>
+  return <ResourceSummary resource={obj}>
     <dt>Machine Config Selector</dt>
     <dd>
       <Selector
diff --git a/frontend/public/components/machine-config.tsx b/frontend/public/components/machine-config.tsx
index 2946f920eb8..15b15214110 100644
--- a/frontend/public/components/machine-config.tsx
+++ b/frontend/public/components/machine-config.tsx
@@ -26,7 +26,7 @@ export const machineConfigReference = referenceForModel(MachineConfigModel);
 const machineConfigMenuActions = [...Kebab.factory.common];
 
 const MachineConfigSummary: React.SFC<MachineConfigSummaryProps> = ({obj}) => (
-  <ResourceSummary resource={obj} showPodSelector={false} showNodeSelector={false}>
+  <ResourceSummary resource={obj}>
     <dt>OS Image URL</dt>
     <dd>{obj.spec.osImageURL || '-'}</dd>
   </ResourceSummary>
diff --git a/frontend/public/components/machine-deployment.tsx b/frontend/public/components/machine-deployment.tsx
index 735c0c268db..0d13b6bbbb3 100644
--- a/frontend/public/components/machine-deployment.tsx
+++ b/frontend/public/components/machine-deployment.tsx
@@ -67,7 +67,7 @@ const MachineDeploymentDetails: React.SFC<MachineDeploymentDetailsProps> = ({obj
       <MachineCounts resourceKind={MachineDeploymentModel} resource={obj} />
       <div className="row">
         <div className="col-sm-6">
-          <ResourceSummary resource={obj} showPodSelector={false} showNodeSelector={false}>
+          <ResourceSummary resource={obj}>
             <dt>Selector</dt>
             <dd>
               <Selector
diff --git a/frontend/public/components/machine-set.tsx b/frontend/public/components/machine-set.tsx
index f5f09db5464..d7c5616fb55 100644
--- a/frontend/public/components/machine-set.tsx
+++ b/frontend/public/components/machine-set.tsx
@@ -142,7 +142,7 @@ const MachineSetDetails: React.SFC<MachineSetDetailsProps> = ({obj}) => {
     <div className="co-m-pane__body">
       <SectionHeading text="Machine Set Overview" />
       <MachineCounts resourceKind={MachineSetModel} resource={obj} />
-      <ResourceSummary resource={obj} showPodSelector={false} showNodeSelector={false}>
+      <ResourceSummary resource={obj}>
         <dt>Selector</dt>
         <dd>
           <Selector
diff --git a/frontend/public/components/machine.tsx b/frontend/public/components/machine.tsx
index 3ee01d769a9..60583feb27b 100644
--- a/frontend/public/components/machine.tsx
+++ b/frontend/public/components/machine.tsx
@@ -25,26 +25,34 @@ const getAWSPlacement = (machine: MachineKind) => _.get(machine, 'spec.providerS
 
 export const getMachineRole = (obj: MachineKind | MachineSetKind | MachineDeploymentKind) => _.get(obj, ['metadata', 'labels', 'sigs.k8s.io/cluster-api-machine-role']);
 
+const getNodeName = (obj) => _.get(obj, 'status.nodeRef.name');
+
 const MachineHeader = props => <ListHeader>
-  <ColHead {...props} className="col-sm-4 col-xs-6" sortField="metadata.name">Name</ColHead>
-  <ColHead {...props} className="col-sm-4 col-xs-6" sortField="metadata.namespace">Namespace</ColHead>
-  <ColHead {...props} className="col-sm-2 hidden-xs" sortField="spec.providerSpec.value.placement.region">Region</ColHead>
-  <ColHead {...props} className="col-sm-2 hidden-xs" sortField="spec.providerSpec.value.placement.availabilityZone">Availability Zone</ColHead>
+  <ColHead {...props} className="col-lg-3 col-md-4 col-sm-4 col-xs-6" sortField="metadata.name">Name</ColHead>
+  <ColHead {...props} className="col-lg-2 col-md-4 col-sm-4 col-xs-6" sortField="metadata.namespace">Namespace</ColHead>
+  <ColHead {...props} className="col-lg-3 col-md-4 col-sm-4 hidden-xs" sortField="status.nodeRef.name">Node</ColHead>
+  <ColHead {...props} className="col-lg-2 hidden-md hidden-sm hidden-xs" sortField="spec.providerSpec.value.placement.region">Region</ColHead>
+  <ColHead {...props} className="col-lg-2 hidden-md hidden-sm hidden-xs" sortField="spec.providerSpec.value.placement.availabilityZone">Availability Zone</ColHead>
 </ListHeader>;
 
 const MachineRow: React.SFC<MachineRowProps> = ({obj}: {obj: MachineKind}) => {
   const { availabilityZone, region } = getAWSPlacement(obj);
+  const nodeName = getNodeName(obj);
+
   return <div className="row co-resource-list__item">
-    <div className="col-sm-4 col-xs-6 co-break-word">
+    <div className="col-lg-3 col-md-4 col-sm-4 col-xs-6 co-break-word">
       <ResourceLink kind={machineReference} name={obj.metadata.name} namespace={obj.metadata.namespace} title={obj.metadata.name} />
     </div>
-    <div className="col-sm-4 col-xs-6 co-break-word">
+    <div className="col-lg-2 col-md-4 col-sm-4 col-xs-6 co-break-word">
       <ResourceLink kind="Namespace" name={obj.metadata.namespace} />
     </div>
-    <div className="col-sm-2 hidden-xs">
+    <div className="col-lg-3 col-md-4 col-sm-4 hidden-xs">
+      {nodeName ? <NodeLink name={nodeName} /> : '-'}
+    </div>
+    <div className="col-lg-2 hidden-md hidden-sm hidden-xs">
       {region || '-'}
     </div>
-    <div className="col-sm-2 hidden-xs">
+    <div className="col-lg-2 hidden-md hidden-sm hidden-xs">
       {availabilityZone || '-'}
     </div>
     <div className="dropdown-kebab-pf">
@@ -54,13 +62,13 @@ const MachineRow: React.SFC<MachineRowProps> = ({obj}: {obj: MachineKind}) => {
 };
 
 const MachineDetails: React.SFC<MachineDetailsProps> = ({obj}: {obj: MachineKind}) => {
-  const nodeName = _.get(obj, 'status.nodeRef.name');
+  const nodeName = getNodeName(obj);
   const machineRole = getMachineRole(obj);
   const { availabilityZone, region } = getAWSPlacement(obj);
   return <React.Fragment>
     <div className="co-m-pane__body">
       <SectionHeading text="Machine Overview" />
-      <ResourceSummary resource={obj} showPodSelector={false} showNodeSelector={false}>
+      <ResourceSummary resource={obj}>
         {nodeName && <React.Fragment>
           <dt>Node</dt>
           <dd><NodeLink name={nodeName} /></dd>
diff --git a/frontend/public/components/masthead-toolbar.jsx b/frontend/public/components/masthead-toolbar.jsx
index e914cc70bef..86c3d5d05a2 100644
--- a/frontend/public/components/masthead-toolbar.jsx
+++ b/frontend/public/components/masthead-toolbar.jsx
@@ -9,7 +9,7 @@ import { authSvc } from '../module/auth';
 import { history, Firehose } from './utils';
 import { openshiftHelpBase } from './utils/documentation';
 import { AboutModal } from './about-modal';
-import { getAvailableClusterUpdates, clusterVersionReference } from './cluster-settings/cluster-settings';
+import { getAvailableClusterUpdates, clusterVersionReference } from '../module/k8s/cluster-settings';
 
 const UpdatesAvailableButton = ({obj, onClick}) => {
   const updatesAvailable = !_.isEmpty(getAvailableClusterUpdates(obj.data));
@@ -239,7 +239,7 @@ class MastheadToolbar_ extends React.Component {
     return (
       <React.Fragment>
         <Toolbar>
-          <ToolbarGroup className="pf-u-sr-only pf-u-visible-on-md">
+          <ToolbarGroup className="pf-u-screen-reader pf-u-visible-on-md">
             {/* desktop -- (updates button) */}
             <Firehose resources={resources}>
               <UpdatesAvailableButton onClick={this._onClusterUpdatesAvailable} />
@@ -285,9 +285,9 @@ class MastheadToolbar_ extends React.Component {
           </ToolbarGroup>
           <ToolbarGroup >
             {/* mobile -- kebab dropdown [(cluster manager |) documentation, about (| logout)] */}
-            <ToolbarItem className="pf-u-hidden-on-md pf-u-mr-0">{this._renderMenu(true)}</ToolbarItem>
+            <ToolbarItem className="pf-u-hidden-on-md">{this._renderMenu(true)}</ToolbarItem>
             {/* desktop -- (user dropdown [logout]) */}
-            <ToolbarItem className="pf-u-sr-only pf-u-visible-on-md">{this._renderMenu(false)}</ToolbarItem>
+            <ToolbarItem className="pf-u-screen-reader pf-u-visible-on-md">{this._renderMenu(false)}</ToolbarItem>
           </ToolbarGroup>
         </Toolbar>
         {showAboutModal && <AboutModal isOpen={showAboutModal} closeAboutModal={this._closeAboutModal} />}
diff --git a/frontend/public/components/masthead.jsx b/frontend/public/components/masthead.jsx
index 7fe9286efa3..8416cbfdd5b 100644
--- a/frontend/public/components/masthead.jsx
+++ b/frontend/public/components/masthead.jsx
@@ -9,43 +9,43 @@ import openshiftLogoImg from '../imgs/openshift-logo.svg';
 import ocpLogoImg from '../imgs/openshift-platform-logo.svg';
 import onlineLogoImg from '../imgs/openshift-online-logo.svg';
 import dedicatedLogoImg from '../imgs/openshift-dedicated-logo.svg';
-import * as pfBg992 from '../../public/imgs/pfbg_992.jpg';
+import azureLogoImg from '../imgs/azure-red-hat-openshift-logo.svg';
 
 export const getBrandingDetails = () => {
-  let backgroundImg, logoImg, logoAlt, productTitle;
+  let logoImg, logoAlt, productTitle;
   // Webpack won't bundle these images if we don't directly reference them, hence the switch
   switch (window.SERVER_FLAGS.branding) {
     case 'openshift':
-      backgroundImg = pfBg992;
       logoImg = openshiftLogoImg;
       logoAlt = 'OpenShift';
       productTitle = 'Red Hat OpenShift';
       break;
     case 'ocp':
-      backgroundImg = pfBg992;
       logoImg = ocpLogoImg;
       logoAlt = 'OpenShift Container Platform';
       productTitle = 'Red Hat OpenShift Container Platform';
       break;
     case 'online':
-      backgroundImg = pfBg992;
       logoImg = onlineLogoImg;
       logoAlt = 'OpenShift Online';
       productTitle = 'Red Hat OpenShift Online';
       break;
     case 'dedicated':
-      backgroundImg = pfBg992;
       logoImg = dedicatedLogoImg;
       logoAlt = 'OpenShift Dedicated';
       productTitle = 'Red Hat OpenShift Dedicated';
       break;
+    case 'azure':
+      logoImg = azureLogoImg;
+      logoAlt = 'Azure Red Hat OpenShift';
+      productTitle = 'Azure Red Hat OpenShift';
+      break;
     default:
-      backgroundImg = pfBg992;
       logoImg = okdLogoImg;
       logoAlt = 'OKD';
       productTitle = 'OKD';
   }
-  return { backgroundImg, logoImg, logoAlt, productTitle };
+  return { logoImg, logoAlt, productTitle };
 };
 
 export const Masthead = ({ onNavToggle }) => {
diff --git a/frontend/public/components/modals/cluster-channel-modal.tsx b/frontend/public/components/modals/cluster-channel-modal.tsx
index be320de0e6a..52c1cb61c01 100644
--- a/frontend/public/components/modals/cluster-channel-modal.tsx
+++ b/frontend/public/components/modals/cluster-channel-modal.tsx
@@ -2,11 +2,20 @@
 
 import * as React from 'react';
 
-import { createModalLauncher, ModalTitle, ModalBody, ModalSubmitFooter, ModalComponentProps } from '../factory/modal';
-import { Dropdown, PromiseComponent } from '../utils';
-import { k8sPatch, K8sResourceKind } from '../../module/k8s';
 import { ClusterVersionModel } from '../../models';
-import { getAvailableClusterChannels } from '../cluster-settings/cluster-settings';
+import { Dropdown, PromiseComponent } from '../utils';
+import {
+  createModalLauncher,
+  ModalBody,
+  ModalComponentProps,
+  ModalSubmitFooter,
+  ModalTitle,
+} from '../factory/modal';
+import {
+  getAvailableClusterChannels,
+  k8sPatch,
+  K8sResourceKind,
+} from '../../module/k8s';
 
 class ClusterChannelModal extends PromiseComponent {
   readonly state: ClusterChannelModalState;
@@ -48,6 +57,7 @@ class ClusterChannelModal extends PromiseComponent {
             items={availableChannels}
             onChange={this._change}
             selectedKey={cv.spec.channel}
+            title="Select Channel"
           />
         </div>
       </ModalBody>
diff --git a/frontend/public/components/modals/cluster-update-modal.tsx b/frontend/public/components/modals/cluster-update-modal.tsx
index d2638a6112c..62189d3e738 100644
--- a/frontend/public/components/modals/cluster-update-modal.tsx
+++ b/frontend/public/components/modals/cluster-update-modal.tsx
@@ -3,11 +3,21 @@
 import * as _ from 'lodash-es';
 import * as React from 'react';
 
-import { createModalLauncher, ModalTitle, ModalBody, ModalSubmitFooter, ModalComponentProps } from '../factory/modal';
-import { Dropdown, PromiseComponent, ExternalLink } from '../utils';
-import { ClusterVersionKind, k8sPatch } from '../../module/k8s';
 import { ClusterVersionModel } from '../../models';
-import { getAvailableClusterUpdates, getDesiredClusterVersion } from '../cluster-settings/cluster-settings';
+import { Dropdown, PromiseComponent } from '../utils';
+import {
+  ClusterVersionKind,
+  getAvailableClusterUpdates,
+  getDesiredClusterVersion,
+  k8sPatch,
+} from '../../module/k8s';
+import {
+  createModalLauncher,
+  ModalBody,
+  ModalComponentProps,
+  ModalSubmitFooter,
+  ModalTitle,
+} from '../factory/modal';
 
 class ClusterUpdateModal extends PromiseComponent {
   readonly state: ClusterUpdateModalState;
@@ -42,10 +52,9 @@ class ClusterUpdateModal extends PromiseComponent {
     return <form onSubmit={this._submit} name="form" className="modal-content">
       <ModalTitle>Update Cluster</ModalTitle>
       <ModalBody>
-        <p>
-          For more detailed documentation on specific versions, &nbsp;
-          <ExternalLink href="https://github.com/openshift/origin/releases" text="view release notes." />
-        </p>
+        {/* <p>
+          // TODO: Determine what content goes here.
+        </p> */}
         <div className="form-group">
           <label>Current Version</label>
           <p>{currentVersion}</p>
diff --git a/frontend/public/components/modals/configure-ns-pull-secret-modal.jsx b/frontend/public/components/modals/configure-ns-pull-secret-modal.jsx
index f2bb33c0139..f52e634abd9 100644
--- a/frontend/public/components/modals/configure-ns-pull-secret-modal.jsx
+++ b/frontend/public/components/modals/configure-ns-pull-secret-modal.jsx
@@ -1,6 +1,7 @@
 import * as _ from 'lodash-es';
 import * as React from 'react';
 import * as PropTypes from 'prop-types';
+import { Base64 } from 'js-base64';
 
 import { k8sPatch, k8sCreate } from '../../module/k8s';
 import { SecretModel } from '../../models';
@@ -14,7 +15,7 @@ const parseExisitingPullSecret = (pullSecret) => {
   let username, email, password, address;
 
   try {
-    const existingData = pullSecret && window.atob(pullSecret.data[CONST.PULL_SECRET_DATA]);
+    const existingData = pullSecret && Base64.decode(pullSecret.data[CONST.PULL_SECRET_DATA]);
 
     if (existingData) {
       const data = JSON.parse(existingData);
@@ -35,7 +36,7 @@ const parseExisitingPullSecret = (pullSecret) => {
       }
       address = keys[0];
       email = data.auths[address].email;
-      const auth = window.atob(data.auths[address].auth);
+      const auth = Base64.decode(data.auths[address].auth);
       const authParts = auth.split(':');
 
       if (authParts.length === 1) {
@@ -68,11 +69,11 @@ const generateSecretData = (formData) => {
   authParts.push(formData.password);
 
   config.auths[formData.address] = {
-    auth:  window.btoa(authParts.join(':')),
+    auth:  Base64.encode(authParts.join(':')),
     email: formData.email,
   };
 
-  return window.btoa(JSON.stringify(config));
+  return Base64.encode(JSON.stringify(config));
 };
 
 class ConfigureNamespacePullSecret extends PromiseComponent {
@@ -127,7 +128,7 @@ class ConfigureNamespacePullSecret extends PromiseComponent {
     let secretData;
 
     if (this.state.method === 'upload') {
-      secretData = window.btoa(this.state.fileData);
+      secretData = Base64.encode(this.state.fileData);
     } else {
       const elements = event.target.elements;
       const formData = {
@@ -169,7 +170,7 @@ class ConfigureNamespacePullSecret extends PromiseComponent {
 
     const existingData = parseExisitingPullSecret(pullSecret);
 
-    return <form onSubmit={this._submit} name="form" className="modal-content">
+    return <form onSubmit={this._submit} name="form" className="modal-content modal-content--large">
       <ModalTitle>Default Pull Secret</ModalTitle>
       <ModalBody>
         <p>
diff --git a/frontend/public/components/monitoring.tsx b/frontend/public/components/monitoring.tsx
index bb1e2c3eafa..689cab4b3a5 100644
--- a/frontend/public/components/monitoring.tsx
+++ b/frontend/public/components/monitoring.tsx
@@ -12,6 +12,7 @@ import { alertState, AlertStates, connectToURLs, MonitoringRoutes, silenceState,
 import store from '../redux';
 import { UIActions } from '../ui/ui-actions';
 import { ColHead, List, ListHeader, ResourceRow, TextFilter } from './factory';
+import { QueryBrowser } from './graphs';
 import { confirmModal } from './modals';
 import { CheckBoxes } from './row-filter';
 import { SafetyFirst } from './safety-first';
@@ -168,6 +169,15 @@ const Label = ({k, v}) => <div className="co-m-label co-m-label--expand" key={k}
   <span className="co-m-label__value">{v}</span>
 </div>;
 
+const Graph = ({metric = undefined, numSamples, rule}) => {
+  const {duration = 0, query = ''} = rule || {};
+
+  // 3 times the rule's duration, but not less than 30 minutes
+  const timeSpan = Math.max(3 * duration, 30 * 60) * 1000;
+
+  return <QueryBrowser metric={metric} numSamples={numSamples} query={query} timeSpan={timeSpan} />;
+};
+
 const SilenceMatchersList = ({silence}) => <div className={`co-text-${SilenceResource.kind.toLowerCase()}`}>
   {_.map(silence.matchers, ({name, isRegex, value}, i) => <Label key={i} k={name} v={isRegex ? `~${value}` : value} />)}
 </div>;
@@ -201,7 +211,7 @@ const AlertsDetailsPage = withFallback(connect(alertStateToProps)((props: Alerts
     <StatusBox data={alert} label={AlertResource.label} loaded={loaded} loadError={loadError}>
       <div className="co-m-nav-title co-m-nav-title--detail">
         <h1 className="co-m-pane__heading">
-          <div className="co-m-pane__name"><MonitoringResourceIcon className="co-m-resource-icon--lg pull-left" resource={AlertResource} />{alertname}</div>
+          <div className="co-m-pane__name"><MonitoringResourceIcon className="co-m-resource-icon--lg" resource={AlertResource} />{alertname}</div>
           {(state === AlertStates.Firing || state === AlertStates.Pending) && <div className="co-actions">
             <ActionsMenu actions={[silenceAlert(alert)]} />
           </div>}
@@ -210,6 +220,11 @@ const AlertsDetailsPage = withFallback(connect(alertStateToProps)((props: Alerts
       <div className="co-m-pane__body">
         <SectionHeading text="Alert Overview" />
         <div className="co-m-pane__body-group">
+          <div className="row">
+            <div className="col-sm-12">
+              {state !== AlertStates.NotFiring && <Graph metric={labels} numSamples={600} rule={rule} />}
+            </div>
+          </div>
           <div className="row">
             <div className="col-sm-6">
               <dl className="co-m-pane__details">
@@ -273,17 +288,6 @@ const AlertsDetailsPage = withFallback(connect(alertStateToProps)((props: Alerts
   </React.Fragment>;
 }));
 
-const ViewInPrometheusLink_ = ({rule, urls}) => {
-  const baseUrl = urls[MonitoringRoutes.Prometheus];
-  const query = _.get(rule, 'query');
-  if (!baseUrl || !query) {
-    return null;
-  }
-  const href = `${baseUrl}/graph?g0.expr=${encodeURIComponent(query)}&g0.tab=0`;
-  return <ExternalLink href={href} text="View in Prometheus UI" />;
-};
-const ViewInPrometheusLink = connectToURLs(MonitoringRoutes.Prometheus)(ViewInPrometheusLink_);
-
 const ActiveAlerts = ({alerts, ruleID}) => <div className="co-m-table-grid co-m-table-grid--bordered">
   <div className="row co-m-table-grid__head">
     <div className="col-xs-6">Description</div>
@@ -323,13 +327,12 @@ const AlertRulesDetailsPage = withFallback(connect(ruleStateToProps)((props: Ale
     <StatusBox data={rule} label={AlertRuleResource.label} loaded={loaded} loadError={loadError}>
       <div className="co-m-nav-title co-m-nav-title--detail">
         <h1 className="co-m-pane__heading">
-          <div className="co-m-pane__name"><MonitoringResourceIcon className="co-m-resource-icon--lg pull-left" resource={AlertRuleResource} />{name}</div>
+          <div className="co-m-pane__name"><MonitoringResourceIcon className="co-m-resource-icon--lg" resource={AlertRuleResource} />{name}</div>
         </h1>
       </div>
       <div className="co-m-pane__body">
         <div className="monitoring-heading">
           <SectionHeading text="Alert Rule Overview" />
-          <ViewInPrometheusLink rule={rule} />
         </div>
         <div className="co-m-pane__body-group">
           <div className="row">
@@ -362,6 +365,11 @@ const AlertRulesDetailsPage = withFallback(connect(ruleStateToProps)((props: Ale
       <div className="co-m-pane__body">
         <div className="co-m-pane__body-group">
           <SectionHeading text="Active Alerts" />
+          <div className="row">
+            <div className="col-sm-12">
+              <Graph numSamples={300} rule={rule} />
+            </div>
+          </div>
           <div className="row">
             <div className="col-xs-12">
               {_.isEmpty(alerts) ? <div className="text-center">None Found</div> : <ActiveAlerts alerts={alerts} ruleID={rule.id} />}
@@ -412,7 +420,7 @@ const SilencesDetailsPage = withFallback(connect(silenceParamToProps)((props: Si
     <StatusBox data={silence} label={SilenceResource.label} loaded={loaded} loadError={loadError}>
       <div className="co-m-nav-title co-m-nav-title--detail">
         <h1 className="co-m-pane__heading">
-          <div className="co-m-pane__name"><MonitoringResourceIcon className="co-m-resource-icon--lg pull-left" resource={SilenceResource} />{name}</div>
+          <div className="co-m-pane__name"><MonitoringResourceIcon className="co-m-resource-icon--lg" resource={SilenceResource} />{name}</div>
           <SilenceActionsMenu silence={silence} />
         </h1>
       </div>
diff --git a/frontend/public/components/namespace.jsx b/frontend/public/components/namespace.jsx
index 7ab1b7ac9dd..cccaccbc8c0 100644
--- a/frontend/public/components/namespace.jsx
+++ b/frontend/public/components/namespace.jsx
@@ -201,7 +201,7 @@ export const NamespaceSummary = ({ns}) => {
   const requester = getRequester(ns);
   return <div className="row">
     <div className="col-sm-6 col-xs-12">
-      <ResourceSummary resource={ns} showPodSelector={false} showNodeSelector={false}>
+      <ResourceSummary resource={ns}>
         {displayName && <dt>Display Name</dt>}
         {displayName && <dd>{displayName}</dd>}
         {requester && <dt>Requester</dt>}
diff --git a/frontend/public/components/nav.jsx b/frontend/public/components/nav.jsx
index ff74b7e84cb..fd9d87cc996 100644
--- a/frontend/public/components/nav.jsx
+++ b/frontend/public/components/nav.jsx
@@ -25,7 +25,7 @@ import {
 } from '../models';
 import { referenceForModel } from '../module/k8s';
 
-import { history, stripBasePath } from './utils';
+import { stripBasePath } from './utils';
 
 export const matchesPath = (resourcePath, prefix) => resourcePath === prefix || _.startsWith(resourcePath, `${prefix}/`);
 export const matchesModel = (resourcePath, model) => model && matchesPath(resourcePath, referenceForModel(model));
@@ -55,13 +55,13 @@ class NavLink extends React.PureComponent {
   }
 
   render() {
-    const { isActive, id, name, onClick } = this.props;
+    const { isActive, isSeparated, id, name, onClick } = this.props;
 
     // onClick is now handled globally by the Nav's onSelect,
     // however onClick can still be passed if desired in certain cases
 
     return (
-      <NavItem isActive={isActive}>
+      <NavItem isActive={isActive} isSeparated={isSeparated}>
         <Link
           id={id}
           to={this.to}
@@ -140,9 +140,7 @@ HrefLink.propTypes = {
 
 const navSectionStateToProps = (state, {required}) => {
   const flags = state[featureReducerName];
-  // `required` can either be a single flag or array. Cast to an array when it's a single value.
-  const requiredArray = required ? _.castArray(required) : [];
-  const canRender = _.every(requiredArray, flag => flags.get(flag));
+  const canRender = required ? flags.get(required) : true;
 
   return {
     flags, canRender,
@@ -155,8 +153,7 @@ const NavSection = connect(navSectionStateToProps)(
   class NavSection extends React.Component {
     constructor(props) {
       super(props);
-      this.toggle = e => this.toggle_(e);
-      this.open = () => this.open_();
+      this.toggle = (e, val) => this.toggle_(e, val);
       this.state = { isOpen: false, activeChild: null };
 
       const activeChild = this.getActiveChild();
@@ -217,23 +214,8 @@ const NavSection = connect(navSectionStateToProps)(
       this.setState(state);
     }
 
-    open_() {
-      this.setState({isOpen: true});
-    }
-
-    toggle_(e) {
-      const { href, onClick } = this.props;
-
-      if (href) {
-        e && e.stopPropagation();
-        history.push(href);
-      }
-
-      if (onClick) {
-        onClick();
-      }
-
-      this.setState({isOpen: !this.state.isOpen});
+    toggle_(e, expandState) {
+      this.setState({isOpen: expandState});
     }
 
     render() {
@@ -260,7 +242,7 @@ const NavSection = connect(navSectionStateToProps)(
       });
 
       return Children ? (
-        <NavExpandable title={title} isActive={isActive} isExpanded={isOpen}>
+        <NavExpandable title={title} isActive={isActive} isExpanded={isOpen} onExpand={this.toggle}>
           {Children}
         </NavExpandable>
       ) : null;
@@ -286,7 +268,7 @@ const rolebindingsStartsWith = ['rolebindings', 'clusterrolebindings'];
 const quotaStartsWith = ['resourcequotas', 'clusterresourcequotas'];
 const imagestreamsStartsWith = ['imagestreams', 'imagestreamtags'];
 const monitoringAlertsStartsWith = ['monitoring/alerts', 'monitoring/alertrules'];
-const clusterSettingsStartsWith = ['settings/cluster', 'config.openshift.io'];
+const clusterSettingsStartsWith = ['settings/cluster', 'settings/idp', 'config.openshift.io'];
 
 const monitoringNavSectionStateToProps = (state) => ({
   canAccess: !!state[featureReducerName].get(FLAGS.CAN_GET_NS),
@@ -338,7 +320,7 @@ export const Navigation = ({ isNavOpen, onNavSelect }) => {
             startsWith={provisionedServicesStartsWith}
             required={FLAGS.SERVICE_CATALOG}
           />
-          <HrefLink required={FLAGS.OPERATOR_HUB} href="/operatorhub" name="Operator Hub" activePath="/operatorhub/" />
+          <HrefLink required={FLAGS.OPERATOR_HUB} href="/operatorhub" name="OperatorHub" activePath="/operatorhub/" />
           <HrefLink
             href="/operatormanagement"
             name="Operator Management"
@@ -360,7 +342,7 @@ export const Navigation = ({ isNavOpen, onNavSelect }) => {
           <ResourceNSLink resource="deploymentconfigs" name={DeploymentConfigModel.labelPlural} required={FLAGS.OPENSHIFT} />
           <ResourceNSLink resource="statefulsets" name="Stateful Sets" />
           <ResourceNSLink resource="secrets" name="Secrets" />
-          <ResourceNSLink resource="configmaps" name="Config Maps" />
+          <ResourceNSLink resource="configmaps" name="Config Maps" isSeparated />
           <ResourceNSLink resource="cronjobs" name="Cron Jobs" />
           <ResourceNSLink resource="jobs" name="Jobs" />
           <ResourceNSLink resource="daemonsets" name="Daemon Sets" />
@@ -390,17 +372,17 @@ export const Navigation = ({ isNavOpen, onNavSelect }) => {
 
         <MonitoringNavSection />
 
-        <NavSection title="Machines" required={[FLAGS.CLUSTER_API, FLAGS.MACHINE_CONFIG, FLAGS.CAN_LIST_MACHINE_CONFIG]}>
-          <ResourceNSLink resource={referenceForModel(MachineModel)} name="Machines" />
-          <ResourceNSLink resource={referenceForModel(MachineSetModel)} name="Machine Sets" />
-          <ResourceClusterLink resource={referenceForModel(MachineConfigModel)} name="Machine Configs" />
-          <ResourceClusterLink resource={referenceForModel(MachineConfigPoolModel)} name="Machine Config Pools" />
+        <NavSection title="Compute" required={FLAGS.CAN_LIST_NODE}>
+          <ResourceClusterLink resource="nodes" name="Nodes" />
+          <ResourceNSLink resource={referenceForModel(MachineModel)} name="Machines" required={FLAGS.CLUSTER_API} />
+          <ResourceNSLink resource={referenceForModel(MachineSetModel)} name="Machine Sets" required={FLAGS.CLUSTER_API} isSeparated />
+          <ResourceClusterLink resource={referenceForModel(MachineConfigModel)} name="Machine Configs" required={FLAGS.MACHINE_CONFIG} />
+          <ResourceClusterLink resource={referenceForModel(MachineConfigPoolModel)} name="Machine Config Pools" required={FLAGS.MACHINE_CONFIG} />
         </NavSection>
 
         <NavSection title="Administration">
           <HrefLink href="/settings/cluster" activePath="/settings/cluster/" name="Cluster Settings" required={FLAGS.CLUSTER_VERSION} startsWith={clusterSettingsStartsWith} />
           <ResourceClusterLink resource="namespaces" name="Namespaces" required={FLAGS.CAN_LIST_NS} />
-          <ResourceClusterLink resource="nodes" name="Nodes" required={FLAGS.CAN_LIST_NODE} />
           <ResourceNSLink resource="serviceaccounts" name="Service Accounts" />
           <ResourceNSLink resource="roles" name="Roles" startsWith={rolesStartsWith} />
           <ResourceNSLink resource="rolebindings" name="Role Bindings" startsWith={rolebindingsStartsWith} />
diff --git a/frontend/public/components/network-policy.jsx b/frontend/public/components/network-policy.jsx
index 06d27d80552..7220783acf9 100644
--- a/frontend/public/components/network-policy.jsx
+++ b/frontend/public/components/network-policy.jsx
@@ -97,7 +97,7 @@ const Details_ = ({obj: np}) => {
   return <React.Fragment>
     <div className="co-m-pane__body">
       <SectionHeading text="Namespace Overview" />
-      <ResourceSummary resource={np} podSelector={'spec.podSelector'} showNodeSelector={false} />
+      <ResourceSummary resource={np} podSelector={'spec.podSelector'} showPodSelector />
     </div>
     <div className="co-m-pane__body">
       <SectionHeading text="Ingress Rules" />
diff --git a/frontend/public/components/node.tsx b/frontend/public/components/node.tsx
index 522ea0ab09c..5d794f94512 100644
--- a/frontend/public/components/node.tsx
+++ b/frontend/public/components/node.tsx
@@ -30,6 +30,16 @@ const menuActions = [MarkAsSchedulable, MarkAsUnschedulable, ModifyLabels, Modif
 
 const NodeKebab = ({node}) => <ResourceKebab actions={menuActions} kind="Node" resource={node} />;
 
+const getMachine = (node: K8sResourceKind) => {
+  const machine = _.get(node, 'metadata.annotations["machine.openshift.io/machine"]');
+  if (!machine) {
+    return null;
+  }
+
+  const [namespace, name] = machine.split('/');
+  return { namespace, name };
+};
+
 export const NodeIPList = ({ips, expand = false}) => <div>
   {_.sortBy(ips, ['type']).map((ip, i) => ip.address && <div key={i} className="co-node-ip">
     {(expand || ip.type === 'InternalIP') && <p>
@@ -44,29 +54,25 @@ const Header = props => {
     return null;
   }
   return <ListHeader>
-    <ColHead {...props} className="col-md-5 col-sm-6 col-xs-8" sortField="metadata.name">Node Name</ColHead>
-    <ColHead {...props} className="col-md-2 col-sm-6 col-xs-4" sortFunc="nodeReadiness">Status</ColHead>
-    <ColHead {...props} className="col-md-5 hidden-sm hidden-xs" sortField="status.addresses">Node Addresses</ColHead>
+    <ColHead {...props} className="col-md-4 col-sm-5 col-xs-8" sortField="metadata.name">Node Name</ColHead>
+    <ColHead {...props} className="col-md-2 col-sm-3 col-xs-4" sortFunc="nodeReadiness">Status</ColHead>
+    <ColHead {...props} className="col-md-3 col-sm-4 hidden-xs" sortField="metadata.annotations['machine.openshift.io/machine']">Machine</ColHead>
+    <ColHead {...props} className="col-md-3 hidden-sm hidden-xs" sortField="status.addresses">Node Addresses</ColHead>
   </ListHeader>;
 };
 
-const HeaderSearch = props => <ListHeader>
-  <ColHead {...props} className="col-lg-2 col-md-3 col-sm-4 col-xs-5" sortField="metadata.name">Node Name</ColHead>
-  <ColHead {...props} className="col-md-2 hidden-sm hidden-xs" sortFunc="nodeReadiness">Status</ColHead>
-  <ColHead {...props} className="col-sm-5 col-xs-7" sortField="metadata.labels">Node Labels</ColHead>
-  <ColHead {...props} className="col-md-2 col-sm-3 hidden-xs" sortField="status.addresses">Node Addresses</ColHead>
-</ListHeader>;
-
 const NodeStatus = ({node}) => <StatusIcon status={nodeStatus(node)} />;
 
 const NodeRow = ({obj: node, expand}) => {
+  const machine = getMachine(node);
 
   return <ResourceRow obj={node}>
-    <div className="col-md-5 col-sm-6 col-xs-8">
+    <div className="col-md-4 col-sm-5 col-xs-8">
       <ResourceLink kind="Node" name={node.metadata.name} title={node.metadata.uid} />
     </div>
-    <div className="col-md-2 col-sm-6 col-xs-4"><NodeStatus node={node} /></div>
-    <div className="col-md-5 hidden-sm hidden-xs"><NodeIPList ips={node.status.addresses} expand={expand} /></div>
+    <div className="col-md-2 col-sm-3 col-xs-4"><NodeStatus node={node} /></div>
+    <div className="col-md-3 col-sm-4 hidden-xs"><ResourceLink kind={referenceForModel(MachineModel)} name={machine.name} namespace={machine.namespace} /></div>
+    <div className="col-md-3 hidden-sm hidden-xs"><NodeIPList ips={node.status.addresses} expand={expand} /></div>
     {expand && <div className="col-xs-12">
       <LabelList kind="Node" labels={node.metadata.labels} />
     </div>}
@@ -76,27 +82,7 @@ const NodeRow = ({obj: node, expand}) => {
   </ResourceRow>;
 };
 
-const NodeRowSearch = ({obj: node}) => <div className="row co-resource-list__item">
-  <div className="col-lg-2 col-md-3 col-sm-4 col-xs-5">
-    <ResourceLink kind="Node" name={node.metadata.name} title={node.metadata.uid} />
-  </div>
-  <div className="col-md-2 hidden-sm hidden-xs">
-    <NodeStatus node={node} />
-  </div>
-  <div className="col-sm-5 col-xs-7">
-    <LabelList kind="Node" labels={node.metadata.labels} expand={false} />
-  </div>
-  <div className="col-md-2 col-sm-3 hidden-xs">
-    <NodeIPList ips={node.status.addresses} />
-  </div>
-  <div className="dropdown-kebab-pf">
-    <NodeKebab node={node} />
-  </div>
-</div>;
-
-// We have different list layouts for the Nodes page list and the Search page list
 const NodesList = props => <List {...props} Header={Header} Row={NodeRow} />;
-export const NodesListSearch = props => <List {...props} Header={HeaderSearch} Row={NodeRowSearch} kind="node" />;
 
 const filters = [{
   type: 'node-status',
@@ -141,16 +127,6 @@ const NodeGraphs = requirePrometheus(({node}) => {
   </React.Fragment>;
 });
 
-const getMachine = (node: K8sResourceKind) => {
-  const machine = _.get(node, 'metadata.annotations.machine');
-  if (!machine) {
-    return null;
-  }
-
-  const [namespace, name] = machine.split('/');
-  return { namespace, name };
-};
-
 const Details = ({obj: node}) => {
   const images = _.filter(node.status.images, 'names');
   const machine = getMachine(node);
@@ -234,7 +210,11 @@ const Details = ({obj: node}) => {
     <div className="co-m-pane__body">
       <SectionHeading text="Images" />
       <div className="co-table-container">
-        <table className="table">
+        <table className="table table--layout-fixed">
+          <colgroup>
+            <col className="col-sm-10 col-xs-9"></col>
+            <col className="col-sm-2 col-xs-3"></col>
+          </colgroup>
           <thead>
             <tr>
               <th>Name</th>
@@ -243,7 +223,7 @@ const Details = ({obj: node}) => {
           </thead>
           <tbody>
             {_.map(images, (image, i) => <tr key={i}>
-              <td>{image.names.find(name => !name.includes('@')) || image.names[0]}</td>
+              <td className="co-break-all">{image.names.find(name => !name.includes('@')) || image.names[0]}</td>
               <td>{units.humanize(image.sizeBytes, 'decimalBytes', true).string || '-'}</td>
             </tr>)}
           </tbody>
diff --git a/frontend/public/components/operator-hub/OWNERS b/frontend/public/components/operator-hub/OWNERS
new file mode 100644
index 00000000000..1de54c59735
--- /dev/null
+++ b/frontend/public/components/operator-hub/OWNERS
@@ -0,0 +1,10 @@
+reviewers:
+  - alecmerdler
+  - galletti94
+  - jeff-phillips-18
+  - SamiSousa
+  - spadgett
+approvers:
+  - alecmerdler
+  - jeff-phillips-18
+  - spadgett
diff --git a/frontend/public/components/operator-hub/operator-hub-community-provider-modal.tsx b/frontend/public/components/operator-hub/operator-hub-community-provider-modal.tsx
index 32d7039499d..0a454877026 100644
--- a/frontend/public/components/operator-hub/operator-hub-community-provider-modal.tsx
+++ b/frontend/public/components/operator-hub/operator-hub-community-provider-modal.tsx
@@ -27,9 +27,9 @@ export class OperatorHubCommunityProviderModal extends React.Component<OperatorH
 
   render() {
     const { ignoreWarnings } = this.state;
-    const submitButtonContent = <React.Fragment>Show<span className="hidden-xs"> Community Operators</span></React.Fragment>;
+    const submitButtonContent = <React.Fragment>Continue</React.Fragment>;
     return <form onSubmit={this.submit} className="modal-content co-modal-ignore-warning">
-      <ModalTitle>Show Community Operators</ModalTitle>
+      <ModalTitle>Show Community Operator</ModalTitle>
       <ModalBody className="modal-body">
         <div className="co-modal-ignore-warning__content">
           <div className="co-modal-ignore-warning__icon">
@@ -37,14 +37,13 @@ export class OperatorHubCommunityProviderModal extends React.Component<OperatorH
           </div>
           <div>
             <p>
-              These are operators which have not been vetted or verified by Red Hat.  Community Operators should be used with
+              Community Operators are operators which have not been vetted or verified by Red Hat.  Community Operators should be used with
               caution because their stability is unknown.  Red Hat provides no support for Community Operators.
               {RH_OPERATOR_SUPPORT_POLICY_LINK && (
                 <span className="co-modal-ignore-warning__link">
                   <ExternalLink href={RH_OPERATOR_SUPPORT_POLICY_LINK} text="Learn more about Red Hat’s third party software support policy" />
                 </span>
               )}
-              Do you want to show Community Operators in the Operator Hub?
             </p>
             <Checkbox className="co-modal-ignore-warning__checkbox" onChange={this.onIgnoreChange} checked={ignoreWarnings}>
               Do not show this warning again
diff --git a/frontend/public/components/operator-hub/operator-hub-item-details.tsx b/frontend/public/components/operator-hub/operator-hub-item-details.tsx
index c0fd3980c16..4a8e40c2746 100644
--- a/frontend/public/components/operator-hub/operator-hub-item-details.tsx
+++ b/frontend/public/components/operator-hub/operator-hub-item-details.tsx
@@ -1,6 +1,7 @@
 /* eslint-disable no-undef, no-unused-vars */
 
 import * as React from 'react';
+import * as _ from 'lodash-es';
 import { Button, HintBlock, Modal } from 'patternfly-react';
 import { CatalogItemHeader, PropertiesSidePanel, PropertyItem } from 'patternfly-react-extensions';
 
@@ -34,12 +35,18 @@ export const OperatorHubItemDetails: React.SFC<OperatorHubItemDetailsProps> = ({
 
   const getHintBlock = () => {
     if (installed) {
+      const filterName = _.get(item.obj, 'status.channels[0].currentCSV', item.obj.metadata.name);
       return (
         <HintBlock
           title="Installed Operator"
           body={
             <span>
-              This Operator has been installed on the cluster. <Link to={`/k8s/${namespace ? `ns/${namespace}` : 'all-namespaces'}/clusterserviceversions?rowFilter-clusterserviceversion-status=Copied%2CInstallSucceeded&name=${item.obj.metadata.name}`}>View it here.</Link>
+              This Operator has been installed on the cluster.{' '}
+              <Link to={`/k8s/${namespace ?
+                `ns/${namespace}` :
+                'all-namespaces'}/clusterserviceversions?rowFilter-clusterserviceversion-status=Copied%2CInstallSucceeded&name=${filterName}`}>
+                View it here.
+              </Link>
             </span>
           }
         />
diff --git a/frontend/public/components/operator-hub/operator-hub-items.tsx b/frontend/public/components/operator-hub/operator-hub-items.tsx
index 8ae7d3b11cd..df4f717c118 100644
--- a/frontend/public/components/operator-hub/operator-hub-items.tsx
+++ b/frontend/public/components/operator-hub/operator-hub-items.tsx
@@ -3,15 +3,15 @@
 import * as React from 'react';
 import * as _ from 'lodash-es';
 import * as PropTypes from 'prop-types';
-import { Button, Icon, Modal } from 'patternfly-react';
-import { CatalogTile, FilterSidePanel } from 'patternfly-react-extensions';
+import { Icon, Modal } from 'patternfly-react';
+import { CatalogTile } from 'patternfly-react-extensions';
 
 import { history } from '../utils/router';
 import { COMMUNITY_PROVIDERS_WARNING_LOCAL_STORAGE_KEY } from '../../const';
 import { K8sResourceKind } from '../../module/k8s';
 import { requireOperatorGroup } from '../operator-lifecycle-manager/operator-group';
 import { normalizeIconClass } from '../catalog/catalog-item-icon';
-import { TileViewPage, updateURLParams, getFilterSearchParam, updateActiveFilters } from '../utils/tile-view-page';
+import { TileViewPage } from '../utils/tile-view-page';
 import { OperatorHubItemDetails } from './operator-hub-item-details';
 import { communityOperatorWarningModal } from './operator-hub-community-provider-modal';
 
@@ -23,6 +23,9 @@ const pageDescription = (
     providing a self-service experience.
   </span>
 );
+
+const communityOperatorBadge = <span key="1" className="pf-c-badge pf-m-read">Community</span>;
+
 /**
  * Filter property white list
  */
@@ -56,7 +59,12 @@ const determineCategories = items => {
     });
   });
 
-  return newCategories;
+  const sortedKeys = _.keys(newCategories).sort((key1, key2) => key1.toLowerCase().localeCompare(key2.toLowerCase()));
+
+  return _.reduce(sortedKeys, (categories, key) => {
+    categories[key] = newCategories[key];
+    return categories;
+  }, {});
 };
 
 export const getProviderValue = value => {
@@ -189,22 +197,18 @@ const setURLParams = params => {
 };
 
 export const OperatorHubTileView = requireOperatorGroup(
-  // TODO: Can be functional stateless component
   class OperatorHubTileView extends React.Component<OperatorHubTileViewProps, OperatorHubTileViewState> {
     constructor(props) {
       super(props);
 
       this.state = {
         detailsItem: null,
-        items: props.items,
-        communityOperatorsExist: false,
-        includeCommunityOperators: false,
+        showDetails: false,
         communityModalShown: false,
       };
 
       this.openOverlay = this.openOverlay.bind(this);
       this.closeOverlay = this.closeOverlay.bind(this);
-      this.renderFilterGroup = this.renderFilterGroup.bind(this);
       this.renderTile = this.renderTile.bind(this);
     }
 
@@ -212,119 +216,47 @@ export const OperatorHubTileView = requireOperatorGroup(
       const {items} = this.props;
       const searchParams = new URLSearchParams(window.location.search);
       const detailsItemID = searchParams.get('details-item');
-      const includeCommunityOperators = searchParams.get('community-operators') === 'true';
-      const communityOperatorsExist = _.some(items, item => item.providerType === COMMUNITY_PROVIDER_TYPE);
 
-      let stateItems = items;
-      if (communityOperatorsExist && !includeCommunityOperators) {
-        stateItems = _.filter(items, item => item.providerType !== COMMUNITY_PROVIDER_TYPE);
-      }
-
-      const detailsItem = detailsItemID && _.find(stateItems, {uid: detailsItemID});
+      const detailsItem = detailsItemID && _.find(items, {uid: detailsItemID});
 
-      this.setState({detailsItem, items: stateItems, communityOperatorsExist, includeCommunityOperators});
+      this.setState({detailsItem});
     }
 
-    componentDidUpdate(prevProps, prevState) {
-      const {items} = this.props;
-      const {includeCommunityOperators} = this.state;
-
-      if (!_.isEqual(items, prevProps.items) || includeCommunityOperators !== prevState.includeCommunityOperators) {
-        const communityOperatorsExist = _.some(items, item => item.providerType === COMMUNITY_PROVIDER_TYPE);
-        let stateItems = items;
-        if (communityOperatorsExist && !includeCommunityOperators) {
-          stateItems = _.filter(items, item => item.providerType !== COMMUNITY_PROVIDER_TYPE);
-        }
-        this.setState({items: stateItems, communityOperatorsExist});
-      }
-    }
+    showCommunityOperator = (ignoreWarning: boolean = false) => {
+      const { detailsItem } = this.state;
 
-    openOverlay(detailsItem) {
       const params = new URLSearchParams(window.location.search);
       params.set('details-item', detailsItem.uid);
       setURLParams(params);
+      this.setState({showDetails: true});
 
-      this.setState({detailsItem});
-    }
-
-    closeOverlay() {
-      const params = new URLSearchParams(window.location.search);
-      params.delete('details-item');
-      setURLParams(params);
-
-      this.setState({detailsItem: null});
-    }
-
-    onIncludeCommunityOperatorsToggle = (activeFilters, onUpdateFilters) => {
-      const {items} = this.props;
-      const {includeCommunityOperators} = this.state;
+      if (ignoreWarning) {
+        localStorage.setItem(COMMUNITY_PROVIDERS_WARNING_LOCAL_STORAGE_KEY, 'true');
+      }
+    };
 
-      if (!includeCommunityOperators) {
-        const ignoreWarning = localStorage.getItem(COMMUNITY_PROVIDERS_WARNING_LOCAL_STORAGE_KEY);
-        if (ignoreWarning === 'true') {
-          this.showCommunityOperators();
-          return;
-        }
+    openOverlay(detailsItem) {
+      const ignoreWarning = localStorage.getItem(COMMUNITY_PROVIDERS_WARNING_LOCAL_STORAGE_KEY) === 'true';
 
-        communityOperatorWarningModal({ showCommunityOperators: this.showCommunityOperators });
+      if (!ignoreWarning && detailsItem.providerType === COMMUNITY_PROVIDER_TYPE) {
+        this.setState({detailsItem});
+        communityOperatorWarningModal({ showCommunityOperators: this.showCommunityOperator });
         return;
       }
 
-      const stateItems = _.filter(items, item => item.providerType !== COMMUNITY_PROVIDER_TYPE);
       const params = new URLSearchParams(window.location.search);
-      params.delete('community-operators');
+      params.set('details-item', detailsItem.uid);
       setURLParams(params);
 
-      /* Clear the community filter if it is active */
-      let updatedFilters = activeFilters;
-      if (_.get(activeFilters, 'providerType.Community.active')) {
-        const groupFilter = _.cloneDeep(activeFilters.providerType);
-        _.set(groupFilter, [COMMUNITY_PROVIDER_TYPE, 'active'], false);
-        updateURLParams('providerType', getFilterSearchParam(groupFilter));
-        updatedFilters = updateActiveFilters(activeFilters, 'providerType', COMMUNITY_PROVIDER_TYPE, false);
-        onUpdateFilters(updatedFilters);
-      }
-
-      this.setState({items: stateItems, includeCommunityOperators: false});
-    };
+      this.setState({detailsItem, showDetails: true});
+    }
 
-    showCommunityOperators = (ignoreWarning: boolean = false) => {
-      const { items } = this.props;
+    closeOverlay() {
       const params = new URLSearchParams(window.location.search);
-      params.set('community-operators', 'true');
+      params.delete('details-item');
       setURLParams(params);
 
-      this.setState({items, includeCommunityOperators: true});
-
-      if (ignoreWarning) {
-        localStorage.setItem(COMMUNITY_PROVIDERS_WARNING_LOCAL_STORAGE_KEY, 'true');
-      }
-    };
-
-    renderFilterGroup(filterGroup, groupName, activeFilters, filterCounts, onFilterChange, onUpdateFilters) {
-      const { includeCommunityOperators, communityOperatorsExist } = this.state;
-      return <FilterSidePanel.Category
-        key={groupName}
-        title={operatorHubFilterMap[groupName] || groupName}
-      >
-        {_.map(filterGroup, (filter, filterName) => {
-          const { label, active } = filter;
-          return <FilterSidePanel.CategoryItem
-            key={filterName}
-            count={_.get(filterCounts, [groupName, filterName], 0)}
-            checked={active}
-            onChange={e => onFilterChange(groupName, filterName, e.target.checked)}
-            title={label}
-          >
-            {label}
-          </FilterSidePanel.CategoryItem>;
-        })}
-        {groupName === 'providerType' && communityOperatorsExist && (
-          <Button bsStyle="link" className="co-catalog-page__filter-toggle" onClick={() => this.onIncludeCommunityOperatorsToggle(activeFilters, onUpdateFilters)}>
-            {includeCommunityOperators ? 'Hide Community Operators' : 'Show Community Operators'}
-          </Button>
-        )}
-      </FilterSidePanel.Category>;
+      this.setState({detailsItem: null, showDetails: false});
     }
 
     renderTile(item) {
@@ -336,11 +268,14 @@ export const OperatorHubTileView = requireOperatorGroup(
       const normalizedIconClass = iconClass && `icon ${normalizeIconClass(iconClass)}`;
       const vendor = provider ? `provided by ${provider}` : null;
 
+      const badges = item.providerType === COMMUNITY_PROVIDER_TYPE ? [communityOperatorBadge] : [];
+
       return (
         <CatalogTile
           id={uid}
           key={uid}
           title={name}
+          badges={badges}
           iconImg={imgUrl}
           iconClass={normalizedIconClass}
           vendor={vendor}
@@ -352,7 +287,8 @@ export const OperatorHubTileView = requireOperatorGroup(
     }
 
     render() {
-      const { items, detailsItem } = this.state;
+      const { detailsItem, showDetails } = this.state;
+      const { items } = this.props;
 
       return <React.Fragment>
         <TileViewPage
@@ -361,13 +297,13 @@ export const OperatorHubTileView = requireOperatorGroup(
           getAvailableCategories={determineCategories}
           getAvailableFilters={determineAvailableFilters}
           filterGroups={operatorHubFilterGroups}
-          renderFilterGroup={this.renderFilterGroup}
+          filterGroupNameMap={operatorHubFilterMap}
           keywordCompare={keywordCompare}
           renderTile={this.renderTile}
           pageDescription={pageDescription}
-          emptyStateInfo="No Operator Hub items are being shown due to the filters being applied."
+          emptyStateInfo="No OperatorHub items are being shown due to the filters being applied."
         />
-        <Modal show={!!detailsItem} onHide={this.closeOverlay} bsSize="lg" className="co-catalog-page__overlay right-side-modal-pf">
+        <Modal show={!!detailsItem && showDetails} onHide={this.closeOverlay} bsSize="lg" className="co-catalog-page__overlay right-side-modal-pf">
           {detailsItem && <OperatorHubItemDetails namespace={this.props.namespace} item={detailsItem} closeOverlay={this.closeOverlay} />}
         </Modal>
       </React.Fragment>;
@@ -388,9 +324,7 @@ export type OperatorHubTileViewProps = {
 
 export type OperatorHubTileViewState = {
   detailsItem: any;
-  items: any[];
-  communityOperatorsExist: boolean;
-  includeCommunityOperators: boolean;
+  showDetails: boolean;
   communityModalShown: boolean;
 };
 
diff --git a/frontend/public/components/operator-hub/operator-hub-page.tsx b/frontend/public/components/operator-hub/operator-hub-page.tsx
index fc7cbb87ee8..63dfb322175 100644
--- a/frontend/public/components/operator-hub/operator-hub-page.tsx
+++ b/frontend/public/components/operator-hub/operator-hub-page.tsx
@@ -34,7 +34,7 @@ export const OperatorHubList: React.SFC<OperatorHubListProps> = (props) => {
       imgUrl: iconObj ? `data:${iconObj.mediatype};base64,${iconObj.base64data}` : operatorImg,
       description: currentCSVAnnotations.description || currentCSVDesc.description,
       longDescription: currentCSVDesc.description || currentCSVAnnotations.description,
-      provider: _.get(pkg, 'metadata.labels.provider'),
+      provider: _.get(pkg, 'status.provider.name', _.get(pkg, 'metadata.labels.provider')),
       providerType: getOperatorProviderType(pkg),
       tags: pkg.metadata.tags,
       version: _.get(currentCSVDesc, 'version'),
@@ -59,8 +59,8 @@ export const OperatorHubList: React.SFC<OperatorHubListProps> = (props) => {
     label="Resources"
     EmptyMsg={() => (
       <MsgBox
-        title="No Operator Hub Items Found"
-        detail={<span>Please check that the OperatorHub is running and that you have created a valid OperatorSource. For more information about Operator Hub, please click <ExternalLink href="https://github.com/operator-framework/operator-marketplace" text="here" />.</span>}
+        title="No OperatorHub Items Found"
+        detail={<span>Please check that the OperatorHub is running and that you have created a valid OperatorSource. For more information about OperatorHub, please click <ExternalLink href="https://github.com/operator-framework/operator-marketplace" text="here" />.</span>}
       />
     )}>
     <OperatorHubTileView items={items} catalogSourceConfig={sourceConfigs} namespace={namespace} />
@@ -69,10 +69,10 @@ export const OperatorHubList: React.SFC<OperatorHubListProps> = (props) => {
 
 export const OperatorHubPage = withFallback((props: OperatorHubPageProps) => <React.Fragment>
   <Helmet>
-    <title>Operator Hub</title>
+    <title>OperatorHub</title>
   </Helmet>
   <div className="co-catalog">
-    <PageHeading title="Operator Hub" />
+    <PageHeading title="OperatorHub" />
     <div className="co-catalog-connect">
       <Firehose resources={[{
         isList: true,
diff --git a/frontend/public/components/operator-hub/operator-hub-subscribe.tsx b/frontend/public/components/operator-hub/operator-hub-subscribe.tsx
index 315d7eebca9..0a13f373a6c 100644
--- a/frontend/public/components/operator-hub/operator-hub-subscribe.tsx
+++ b/frontend/public/components/operator-hub/operator-hub-subscribe.tsx
@@ -223,7 +223,7 @@ export const OperatorHubSubscribeForm = withFormState((props: OperatorHubSubscri
 
 export const OperatorHubSubscribePage: React.SFC<OperatorHubSubscribePageProps> = (props) => <div className="co-m-pane__body">
   <Helmet>
-    <title>Operator Hub Subscription</title>
+    <title>OperatorHub Subscription</title>
   </Helmet>
   <div>
     <h1>Create Operator Subscription</h1>
diff --git a/frontend/public/components/operator-lifecycle-manager/OWNERS b/frontend/public/components/operator-lifecycle-manager/OWNERS
index f7f9cdb41e7..2bae8adad6a 100644
--- a/frontend/public/components/operator-lifecycle-manager/OWNERS
+++ b/frontend/public/components/operator-lifecycle-manager/OWNERS
@@ -3,3 +3,5 @@ reviewers:
   - josephschorr
 approvers:
   - alecmerdler
+  - ecordell
+  - spadgett
diff --git a/frontend/public/components/operator-lifecycle-manager/clusterserviceversion-resource.tsx b/frontend/public/components/operator-lifecycle-manager/clusterserviceversion-resource.tsx
index 97bbf01fdf2..57b4fb951ed 100644
--- a/frontend/public/components/operator-lifecycle-manager/clusterserviceversion-resource.tsx
+++ b/frontend/public/components/operator-lifecycle-manager/clusterserviceversion-resource.tsx
@@ -191,7 +191,7 @@ export const ClusterServiceVersionResourceDetails = connectToModel(
             <div className="row">
               <div className="col-xs-6">
                 { this.state.expanded
-                  ? <ResourceSummary resource={this.props.obj} showPodSelector={false} />
+                  ? <ResourceSummary resource={this.props.obj} />
                   : <dl className="co-m-pane__details">
                     <dt>Name</dt>
                     <dd>{metadata.name}</dd>
diff --git a/frontend/public/components/operator-lifecycle-manager/clusterserviceversion.tsx b/frontend/public/components/operator-lifecycle-manager/clusterserviceversion.tsx
index f3a676500c9..d9c873512cb 100644
--- a/frontend/public/components/operator-lifecycle-manager/clusterserviceversion.tsx
+++ b/frontend/public/components/operator-lifecycle-manager/clusterserviceversion.tsx
@@ -214,7 +214,7 @@ export const ClusterServiceVersionDetails: React.SFC<ClusterServiceVersionDetail
       <div className="co-m-pane__body-group">
         <div className="row">
           <div className="col-sm-6">
-            <ResourceSummary resource={props.obj} showNodeSelector={false} showPodSelector={false} />
+            <ResourceSummary resource={props.obj} />
           </div>
           <div className="col-sm-6">
             <dt>Status</dt>
diff --git a/frontend/public/components/operator-lifecycle-manager/install-plan.tsx b/frontend/public/components/operator-lifecycle-manager/install-plan.tsx
index 7ef44d26239..353dd3b2a66 100644
--- a/frontend/public/components/operator-lifecycle-manager/install-plan.tsx
+++ b/frontend/public/components/operator-lifecycle-manager/install-plan.tsx
@@ -94,7 +94,7 @@ export const InstallPlanDetails: React.SFC<InstallPlanDetailsProps> = ({obj}) =>
       <div className="co-m-pane__body-group">
         <div className="row">
           <div className="col-sm-6">
-            <ResourceSummary resource={obj} showNodeSelector={false} showPodSelector={false} showAnnotations={false} />
+            <ResourceSummary resource={obj} showAnnotations={false} />
           </div>
           <div className="col-sm-6">
             <dl className="co-m-pane__details">
diff --git a/frontend/public/components/operator-lifecycle-manager/subscription.tsx b/frontend/public/components/operator-lifecycle-manager/subscription.tsx
index b2211b40d44..18efdf8c8d3 100644
--- a/frontend/public/components/operator-lifecycle-manager/subscription.tsx
+++ b/frontend/public/components/operator-lifecycle-manager/subscription.tsx
@@ -103,7 +103,7 @@ export const SubscriptionDetails: React.SFC<SubscriptionDetailsProps> = (props)
     <div className="co-m-pane__body-group">
       <div className="row">
         <div className="col-sm-6">
-          <ResourceSummary resource={obj} showNodeSelector={false} showPodSelector={false} showAnnotations={false} />
+          <ResourceSummary resource={obj} showAnnotations={false} />
         </div>
         <div className="col-sm-6">
           <dl className="co-m-pane__details">
diff --git a/frontend/public/components/overview/daemon-set-overview.tsx b/frontend/public/components/overview/daemon-set-overview.tsx
index e65950e10e8..3e886714883 100644
--- a/frontend/public/components/overview/daemon-set-overview.tsx
+++ b/frontend/public/components/overview/daemon-set-overview.tsx
@@ -15,7 +15,7 @@ import { ResourceOverviewDetails } from './resource-overview-details';
 const DaemonSetOverviewDetails: React.SFC<DaemonSetOverviewDetailsProps> = ({item}) =>
   <div className="co-m-pane__body resource-overview__body">
     <div className="resource-overview__summary">
-      <ResourceSummary resource={item.obj} />
+      <ResourceSummary resource={item.obj} showPodSelector showNodeSelector />
     </div>
     <div className="resource-overview__details">
       <DaemonSetDetailsList ds={item.obj} />
diff --git a/frontend/public/components/overview/deployment-config-overview.tsx b/frontend/public/components/overview/deployment-config-overview.tsx
index 6ed903c7a31..c7251966316 100644
--- a/frontend/public/components/overview/deployment-config-overview.tsx
+++ b/frontend/public/components/overview/deployment-config-overview.tsx
@@ -23,7 +23,7 @@ const DeploymentConfigOverviewDetails: React.SFC<DeploymentConfigOverviewDetails
       <DeploymentPodCounts resource={dc} resourceKind={DeploymentConfigModel} />
     </div>
     <div className="resource-overview__summary">
-      <ResourceSummary resource={dc}>
+      <ResourceSummary resource={dc} showPodSelector showNodeSelector>
         <dt>Status</dt>
         <dd>
           {
diff --git a/frontend/public/components/overview/deployment-overview.tsx b/frontend/public/components/overview/deployment-overview.tsx
index f9acd7ae0b4..f1ae5356148 100644
--- a/frontend/public/components/overview/deployment-overview.tsx
+++ b/frontend/public/components/overview/deployment-overview.tsx
@@ -23,7 +23,7 @@ const DeploymentOverviewDetails: React.SFC<DeploymentOverviewDetailsProps> = ({i
       <DeploymentPodCounts resource={item.obj} resourceKind={DeploymentModel} />
     </div>
     <div className="resource-overview__summary">
-      <ResourceSummary resource={item.obj}>
+      <ResourceSummary resource={item.obj} showPodSelector showNodeSelector>
         <dt>Status</dt>
         <dd>
           {
diff --git a/frontend/public/components/overview/stateful-set-overview.tsx b/frontend/public/components/overview/stateful-set-overview.tsx
index 63d61d5b64f..f8c3dc0a7b1 100644
--- a/frontend/public/components/overview/stateful-set-overview.tsx
+++ b/frontend/public/components/overview/stateful-set-overview.tsx
@@ -10,7 +10,7 @@ import { ResourceOverviewDetails } from './resource-overview-details';
 
 const StatefulSetOverviewDetails: React.SFC<StatefulSetOverviewDetailsProps> = ({item}) =>
   <div className="overview__sidebar-pane-body resource-overview__body">
-    <ResourceSummary resource={item.obj} />
+    <ResourceSummary resource={item.obj} showPodSelector showNodeSelector />
   </div>;
 
 const tabs = [
diff --git a/frontend/public/components/persistent-volume-claim.jsx b/frontend/public/components/persistent-volume-claim.jsx
index ca06058e8c1..4e52b5b41ee 100644
--- a/frontend/public/components/persistent-volume-claim.jsx
+++ b/frontend/public/components/persistent-volume-claim.jsx
@@ -50,7 +50,7 @@ const Details_ = ({flags, obj: pvc}) => {
     <SectionHeading text="PersistentVolumeClaim Overview" />
     <div className="row">
       <div className="col-sm-6">
-        <ResourceSummary resource={pvc} showPodSelector={false} showNodeSelector={false}>
+        <ResourceSummary resource={pvc}>
           <dt>Label Selector</dt>
           <dd><Selector selector={labelSelector} /></dd>
         </ResourceSummary>
diff --git a/frontend/public/components/persistent-volume.jsx b/frontend/public/components/persistent-volume.jsx
index 6dfb98ad0f8..7795c6a6ce1 100644
--- a/frontend/public/components/persistent-volume.jsx
+++ b/frontend/public/components/persistent-volume.jsx
@@ -31,7 +31,7 @@ const Row = ({obj}) => <div className="row co-resource-list__item">
 const Details = ({obj}) => <React.Fragment>
   <div className="co-m-pane__body">
     <SectionHeading text="PersistentVolume Overview" />
-    <ResourceSummary resource={obj} podSelector="spec.podSelector" showNodeSelector={false} />
+    <ResourceSummary resource={obj} podSelector="spec.podSelector" showNodeSelector={false} showPodSelector />
   </div>
 </React.Fragment>;
 
diff --git a/frontend/public/components/pod.jsx b/frontend/public/components/pod.jsx
index 64e7d6b0b79..b329593530a 100644
--- a/frontend/public/components/pod.jsx
+++ b/frontend/public/components/pod.jsx
@@ -101,7 +101,7 @@ export const ContainerRow = ({pod, container}) => {
     <div className="col-lg-2 col-md-3 col-sm-4 col-xs-5">
       <ContainerLink pod={pod} name={container.name} />
     </div>
-    <div className="col-lg-2 col-md-3 col-sm-5 col-xs-7 co-truncate co-nowrap">{container.image || '-'}</div>
+    <div className="col-lg-2 col-md-3 col-sm-5 col-xs-7 co-truncate co-nowrap co-select-to-copy">{container.image || '-'}</div>
     <div className="col-lg-2 col-md-2 col-sm-3 hidden-xs"><StatusIcon status={cstate.label} /></div>
     <div className="col-lg-1 col-md-2 hidden-sm hidden-xs">{_.get(cstatus, 'restartCount', '0')}</div>
     <div className="col-lg-2 col-md-2 hidden-sm hidden-xs"><Timestamp timestamp={startedAt} /></div>
@@ -189,7 +189,7 @@ export const PodDetailsList = ({pod}) => {
 };
 
 export const PodResourceSummary = ({pod}) => (
-  <ResourceSummary resource={pod} showPodSelector={false} showNodeSelector={false}>
+  <ResourceSummary resource={pod} showNodeSelector>
     <dt>Node Selector</dt>
     <dd><Selector kind="Node" selector={pod.spec.nodeSelector} /></dd>
   </ResourceSummary>
diff --git a/frontend/public/components/replicaset.jsx b/frontend/public/components/replicaset.jsx
index 9d748a45cad..d5dcd95f6c7 100644
--- a/frontend/public/components/replicaset.jsx
+++ b/frontend/public/components/replicaset.jsx
@@ -19,7 +19,7 @@ const Details = ({obj: replicaSet}) => {
       <SectionHeading text="Replica Set Overview" />
       <div className="row">
         <div className="col-md-6">
-          <ResourceSummary resource={replicaSet}>
+          <ResourceSummary resource={replicaSet} showPodSelector showNodeSelector>
             {revision && <React.Fragment>
               <dt>Deployment Revision</dt>
               <dd>{revision}</dd>
diff --git a/frontend/public/components/replication-controller.jsx b/frontend/public/components/replication-controller.jsx
index d928d25de83..9eac4b80f2f 100644
--- a/frontend/public/components/replication-controller.jsx
+++ b/frontend/public/components/replication-controller.jsx
@@ -14,7 +14,7 @@ const Details = ({obj: replicationController}) => {
       <SectionHeading text="Replication Controller Overview" />
       <div className="row">
         <div className="col-md-6">
-          <ResourceSummary resource={replicationController}>
+          <ResourceSummary resource={replicationController} showPodSelector showNodeSelector>
             {revision && <React.Fragment>
               <dt>Deployment Revision</dt>
               <dd>{revision}</dd>
diff --git a/frontend/public/components/resource-pages.ts b/frontend/public/components/resource-pages.ts
index 69a25057d2d..da24f3bad1e 100644
--- a/frontend/public/components/resource-pages.ts
+++ b/frontend/public/components/resource-pages.ts
@@ -107,6 +107,7 @@ export const resourceDetailPages = ImmutableMap<GroupVersionKind | string, () =>
   .set(ReportReference, () => import('./chargeback' /* webpackChunkName: "chargeback" */).then(m => m.ReportsDetailsPage))
   .set(ReportGenerationQueryReference, () => import('./chargeback' /* webpackChunkName: "chargeback" */).then(m => m.ReportGenerationQueriesDetailsPage))
   .set(referenceForModel(StorageClassModel), () => import('./storage-class' /* webpackChunkName: "storage-class" */).then(m => m.StorageClassDetailsPage))
+  .set(referenceForModel(CustomResourceDefinitionModel), () => import('./custom-resource-definition' /* webpackChunkName: "custom-resource-definition" */).then(m => m.CustomResourceDefinitionsDetailsPage))
   .set(referenceForModel(ClusterServiceVersionModel), () => import('./operator-lifecycle-manager/clusterserviceversion' /* webpackChunkName: "clusterserviceversion" */).then(m => m.ClusterServiceVersionsDetailsPage))
   .set(referenceForModel(CatalogSourceModel), () => import('./operator-lifecycle-manager/catalog-source' /* webpackChunkName: "catalog-source" */).then(m => m.CatalogSourceDetailsPage))
   .set(referenceForModel(SubscriptionModel), () => import('./operator-lifecycle-manager/subscription' /* webpackChunkName: "subscription" */).then(m => m.SubscriptionDetailsPage))
diff --git a/frontend/public/components/resource-quota.jsx b/frontend/public/components/resource-quota.jsx
index d46152ced29..6b680182948 100644
--- a/frontend/public/components/resource-quota.jsx
+++ b/frontend/public/components/resource-quota.jsx
@@ -166,7 +166,7 @@ const Details = ({obj: rq}) => {
       {showChartRow && <QuotaGaugeCharts quota={rq} resourceTypes={resourceTypes} />}
       <div className="row">
         <div className="col-sm-6">
-          <ResourceSummary resource={rq} showPodSelector={false} showNodeSelector={false} />
+          <ResourceSummary resource={rq} />
         </div>
         {scopes && <div className="col-sm-6">
           <dl className="co-m-pane__details">
@@ -213,7 +213,7 @@ export const quotaType = quota => {
 // Split each resource quota into one row per subject
 export const flatten = resources => _.flatMap(resources, resource => _.compact(resource.data));
 
-export const ResourceQuotasPage = connectToFlags(FLAGS.OPENSHIFT)(({namespace, flags}) => {
+export const ResourceQuotasPage = connectToFlags(FLAGS.OPENSHIFT)(({namespace, flags, mock}) => {
 
   const resources = [{kind: 'ResourceQuota', namespaced: true}];
   let rowFilters = null;
@@ -245,6 +245,7 @@ export const ResourceQuotasPage = connectToFlags(FLAGS.OPENSHIFT)(({namespace, f
     flatten={flatten}
     title="Resource Quotas"
     rowFilters={rowFilters}
+    mock={mock}
   />;
 });
 
diff --git a/frontend/public/components/routes.tsx b/frontend/public/components/routes.tsx
index a237aad0aa1..4e6fc6546e5 100644
--- a/frontend/public/components/routes.tsx
+++ b/frontend/public/components/routes.tsx
@@ -213,7 +213,7 @@ const RouteDetails: React.SFC<RoutesDetailsProps> = ({obj: route}) => <React.Fra
     <SectionHeading text="Route Overview" />
     <div className="row">
       <div className="col-sm-6">
-        <ResourceSummary resource={route} showPodSelector={false} showNodeSelector={false}>
+        <ResourceSummary resource={route}>
           <dt>{route.spec.to.kind}</dt>
           <dd><ResourceLink kind={route.spec.to.kind} name={route.spec.to.name} namespace={route.metadata.namespace}
             title={route.spec.to.name} />
diff --git a/frontend/public/components/secret.jsx b/frontend/public/components/secret.jsx
index 1efc0e2c0ea..96cb81d53c6 100644
--- a/frontend/public/components/secret.jsx
+++ b/frontend/public/components/secret.jsx
@@ -66,7 +66,7 @@ const SecretDetails = ({obj: secret}) => {
   return <React.Fragment>
     <div className="co-m-pane__body">
       <SectionHeading text="Secret Overview" />
-      <ResourceSummary resource={secret} showPodSelector={false} showNodeSelector={false} />
+      <ResourceSummary resource={secret} />
     </div>
     <div className="co-m-pane__body">
       <SecretData data={secret.data} type={secret.type} />
diff --git a/frontend/public/components/secrets/create-secret.tsx b/frontend/public/components/secrets/create-secret.tsx
index eca886a6146..877d87663ab 100644
--- a/frontend/public/components/secrets/create-secret.tsx
+++ b/frontend/public/components/secrets/create-secret.tsx
@@ -2,6 +2,7 @@
 import * as _ from 'lodash-es';
 import * as React from 'react';
 import { Helmet } from 'react-helmet';
+import { Base64 } from 'js-base64';
 
 import { k8sCreate, k8sUpdate, K8sResourceKind, referenceFor } from '../../module/k8s';
 import { ButtonBar, Firehose, history, StatusBox, LoadingBox, Dropdown, resourceObjPath } from '../utils';
@@ -108,7 +109,7 @@ const withSecretForm = (SubForm) => class SecretFormComponent extends React.Comp
       inProgress: false,
       type: defaultSecretType,
       stringData: _.mapValues(_.get(props.obj, 'data'), (value) => {
-        return value ? window.atob(value) : '';
+        return value ? Base64.decode(value) : '';
       }),
       disableForm: false,
     };
@@ -310,7 +311,7 @@ class ConfigEntryForm extends React.Component<ConfigEntryFormProps, ConfigEntryF
   // If 'username' or 'password' fields are updated, 'auth' field has to be updated as well, else stays the same.
   updateAuth(updatedFieldName) {
     return _.includes(['username', 'password'], updatedFieldName)
-      ? window.btoa(`${this.state.username}:${this.state.password}`)
+      ? Base64.encode(`${this.state.username}:${this.state.password}`)
       : this.state.auth;
   }
   changeData(event) {
@@ -421,7 +422,7 @@ class CreateConfigSubform extends React.Component<CreateConfigSubformProps, Crea
     }
     _.each(imageSecretObject, (v, k) => {
       // Decode and parse 'auth' in case 'username' and 'password' are not part of the secret.
-      const decodedAuth = window.atob(_.get(v, 'auth', ''));
+      const decodedAuth = Base64.decode(_.get(v, 'auth', ''));
       const parsedAuth = _.isEmpty(decodedAuth) ? _.fill(Array(2), '') : _.split(decodedAuth, ':');
       imageSecretArray.push({
         entry: {
diff --git a/frontend/public/components/service-account.jsx b/frontend/public/components/service-account.jsx
index adf686f7e61..b2410cb1bf3 100644
--- a/frontend/public/components/service-account.jsx
+++ b/frontend/public/components/service-account.jsx
@@ -1,11 +1,12 @@
 import * as _ from 'lodash-es';
 import * as React from 'react';
 import { safeDump } from 'js-yaml';
+import { Base64 } from 'js-base64';
 
 import { ColHead, DetailsPage, List, ListHeader, ListPage, ResourceRow } from './factory';
 import { Kebab, SectionHeading, navFactory, ResourceKebab, ResourceLink, ResourceSummary } from './utils';
 import { fromNow } from './utils/datetime';
-import { k8sGet } from '../module/k8s';
+import { k8sList } from '../module/k8s';
 import { SecretModel } from '../models';
 import { SecretsPage } from './secret';
 import { saveAs } from 'file-saver';
@@ -15,37 +16,44 @@ const KubeConfigify = (kind, sa) => ({
   label: 'Download kubeconfig file',
   weight: 200,
   callback: () => {
-    const name = _.get(sa, 'secrets[0].name');
+    const name = sa.metadata.name;
     const namespace = sa.metadata.namespace;
 
-    k8sGet(SecretModel, name, namespace).then(({data}) => {
+    k8sList(SecretModel, {ns: namespace}).then((secrets) => {
       const server = window.SERVER_FLAGS.kubeAPIServerURL;
       const url = new URL(server);
-      const clusterName = url.host;
+      const clusterName = url.host.replace(/\./g, '-');
 
-      const token = atob(data.token);
-      const cert = data['ca.crt'];
+      // Find the secret that is the service account token.
+      const saSecretsByName = _.keyBy(sa.secrets, 'name');
+      const secret = _.find(secrets, s => saSecretsByName[s.metadata.name] && s.type === 'kubernetes.io/service-account-token');
+      if (!secret) {
+        errorModal({error: 'Unable to get service account token.'});
+        return;
+      }
+      const token = Base64.decode(secret.data.token);
+      const cert = secret.data['ca.crt'];
 
       const config = {
         apiVersion: 'v1',
-        'current-context': name,
-        kind: 'Config',
-        preferences: {},
         clusters: [{
-          name: clusterName,
           cluster: {
             'certificate-authority-data': cert,
             server,
           },
+          name: clusterName,
         }],
         contexts: [{
-          name,
           context: {
             cluster: clusterName,
             namespace,
             user: name,
           },
+          name,
         }],
+        'current-context': name,
+        kind: 'Config',
+        preferences: {},
         'users': [{
           name,
           user: {
@@ -104,7 +112,7 @@ const Details = ({obj: serviceaccount}) => {
     <React.Fragment>
       <div className="co-m-pane__body">
         <SectionHeading text="Service Account Overview" />
-        <ResourceSummary resource={serviceaccount} showPodSelector={false} showNodeSelector={false} />
+        <ResourceSummary resource={serviceaccount} />
       </div>
       <div className="co-m-pane__body co-m-pane__body--alt">
         <SectionHeading text="Secrets" style={{marginBottom: '-20px'}} />
diff --git a/frontend/public/components/service-binding.tsx b/frontend/public/components/service-binding.tsx
index e1a5c038ca6..02b5b269e05 100644
--- a/frontend/public/components/service-binding.tsx
+++ b/frontend/public/components/service-binding.tsx
@@ -38,7 +38,7 @@ const ServiceBindingDetails: React.SFC<ServiceBindingDetailsProps> = ({obj: sb})
       <SectionHeading text="Service Binding Overview" />
       <div className="row">
         <div className="col-sm-6">
-          <ResourceSummary resource={sb} showPodSelector={false} showNodeSelector={false} />
+          <ResourceSummary resource={sb} />
         </div>
         <div className="col-sm-6">
           <dl className="co-m-pane__details">
diff --git a/frontend/public/components/service-catalog/create-instance.tsx b/frontend/public/components/service-catalog/create-instance.tsx
index 59b1408dfdb..053b060869c 100644
--- a/frontend/public/components/service-catalog/create-instance.tsx
+++ b/frontend/public/components/service-catalog/create-instance.tsx
@@ -134,7 +134,7 @@ class CreateInstance extends React.Component<CreateInstanceProps, CreateInstance
       return <div className="radio co-create-service-instance__plan" key={plan.spec.externalName}>
         <label>
           <input type="radio" name="plan" id="plan" value={plan.spec.externalName} checked={selectedPlanName === plan.spec.externalName} onChange={this.onPlanChange} />
-          {plan.spec.externalMetadata.displayName || plan.spec.externalName}
+          {_.get(plan.spec, ['externalMetadata', 'displayName']) || plan.spec.externalName}
           {plan.spec.description && <div className="text-muted">{plan.spec.description}</div>}
         </label>
       </div>;
diff --git a/frontend/public/components/service-instance.tsx b/frontend/public/components/service-instance.tsx
index 28e69d0c471..f076067fd0f 100644
--- a/frontend/public/components/service-instance.tsx
+++ b/frontend/public/components/service-instance.tsx
@@ -117,7 +117,7 @@ const ServiceInstanceDetails: React.SFC<ServiceInstanceDetailsProps> = ({obj: si
       <SectionHeading text="Service Instance Overview" />
       <div className="row">
         <div className="col-sm-6">
-          <ResourceSummary resource={si} showPodSelector={false} showNodeSelector={false} />
+          <ResourceSummary resource={si} />
         </div>
         <div className="col-sm-6">
           <dl className="co-m-pane__details">
diff --git a/frontend/public/components/service.jsx b/frontend/public/components/service.jsx
index f35f8cf8504..0b10ae5ff02 100644
--- a/frontend/public/components/service.jsx
+++ b/frontend/public/components/service.jsx
@@ -115,7 +115,7 @@ const Details = ({obj: s}) => <div className="co-m-pane__body">
   <div className="row">
     <div className="col-sm-6">
       <SectionHeading text="Service Overview" />
-      <ResourceSummary resource={s} showNodeSelector={false}>
+      <ResourceSummary resource={s} showPodSelector>
         <dt>Session Affinity</dt>
         <dd>{s.spec.sessionAffinity || '-'}</dd>
       </ResourceSummary>
diff --git a/frontend/public/components/stateful-set.jsx b/frontend/public/components/stateful-set.jsx
index ad9d72ca2f4..50f976d5521 100644
--- a/frontend/public/components/stateful-set.jsx
+++ b/frontend/public/components/stateful-set.jsx
@@ -26,7 +26,7 @@ const Row = props => <WorkloadListRow {...props} kind={kind} actions={menuAction
 const Details = ({obj: ss}) => <React.Fragment>
   <div className="co-m-pane__body">
     <SectionHeading text="StatefulSet Overview" />
-    <ResourceSummary resource={ss} showNodeSelector={false} />
+    <ResourceSummary resource={ss} showPodSelector showNodeSelector />
   </div>
   <div className="co-m-pane__body">
     <SectionHeading text="Containers" />
diff --git a/frontend/public/components/storage-class.tsx b/frontend/public/components/storage-class.tsx
index 6702c9ba1f8..f6a5e524061 100644
--- a/frontend/public/components/storage-class.tsx
+++ b/frontend/public/components/storage-class.tsx
@@ -44,7 +44,7 @@ const StorageClassRow: React.SFC<StorageClassRowProps> = ({obj}) => {
 const StorageClassDetails: React.SFC<StorageClassDetailsProps> = ({obj}) => <React.Fragment>
   <div className="co-m-pane__body">
     <SectionHeading text="StorageClass Overview" />
-    <ResourceSummary resource={obj} showNodeSelector={false} showPodSelector={false}>
+    <ResourceSummary resource={obj}>
       <dt>Provisioner</dt>
       <dd>{obj.provisioner || '-'}</dd>
       <dt>Reclaim Policy</dt>
diff --git a/frontend/public/components/storage/create-pvc.tsx b/frontend/public/components/storage/create-pvc.tsx
index e81fa034b0d..95bd1d23821 100644
--- a/frontend/public/components/storage/create-pvc.tsx
+++ b/frontend/public/components/storage/create-pvc.tsx
@@ -47,9 +47,9 @@ export class CreatePVCForm extends React.Component<CreatePVCFormProps, CreatePVC
       },
     ],
     dropdownUnits: {
-      Mi: 'MiB',
-      Gi: 'GiB',
-      Ti: 'TiB',
+      Mi: 'Mi',
+      Gi: 'Gi',
+      Ti: 'Ti',
     },
   };
 
diff --git a/frontend/public/components/utils/_copy-to-clipboard.scss b/frontend/public/components/utils/_copy-to-clipboard.scss
index 1fcc6adfe94..da34b85378f 100644
--- a/frontend/public/components/utils/_copy-to-clipboard.scss
+++ b/frontend/public/components/utils/_copy-to-clipboard.scss
@@ -12,6 +12,7 @@
 }
 
 .co-copy-to-clipboard__text {
+  line-height: 1.4;
   padding-right: 50px;
 }
 
diff --git a/frontend/public/components/utils/datetime.ts b/frontend/public/components/utils/datetime.ts
index 79b1a4a23cb..5befd3c4045 100644
--- a/frontend/public/components/utils/datetime.ts
+++ b/frontend/public/components/utils/datetime.ts
@@ -114,3 +114,39 @@ export const formatDuration = (ms: number) => {
 
   return formatted;
 };
+
+// Conversions between units and milliseconds
+const s = 1000;
+const m = s * 60;
+const h = m * 60;
+const d = h * 24;
+const w = d * 7;
+const units = {w, d, h, m, s};
+
+// Formats a duration in milliseconds like "1h 10m"
+export const formatPrometheusDuration = (ms: number) => {
+  if (!_.isFinite(ms) || ms < 0) {
+    return '';
+  }
+  let remaining = ms;
+  let str = '';
+  _.each(units, (factor, unit) => {
+    const n = Math.floor(remaining / factor);
+    if (n > 0) {
+      str += `${n}${unit} `;
+      remaining -= n * factor;
+    }
+  });
+  return _.trim(str);
+};
+
+// Converts a duration like "1h 10m 23s" to milliseconds or returns 0 if the duration could not be parsed
+export const parsePrometheusDuration = (duration: string): number => {
+  try {
+    const parts = duration.trim().split(/\s+/).map(p => p.match(/^(\d+)([wdhms])$/));
+    return _.sumBy(parts, p => parseInt(p[1], 10) * units[p[2]]);
+  } catch (ignored) {
+    // Invalid duration format
+    return 0;
+  }
+};
diff --git a/frontend/public/components/utils/details-page.tsx b/frontend/public/components/utils/details-page.tsx
index 4be10aa7f8a..df11dfba345 100644
--- a/frontend/public/components/utils/details-page.tsx
+++ b/frontend/public/components/utils/details-page.tsx
@@ -15,7 +15,7 @@ export const detailsPage = <T extends {}>(Component: React.ComponentType<T>) =>
   return <Component {...props} />;
 };
 
-export const ResourceSummary: React.SFC<ResourceSummaryProps> = ({children, resource, showPodSelector = true, showNodeSelector = true, showAnnotations = true, podSelector = 'spec.selector'}) => {
+export const ResourceSummary: React.SFC<ResourceSummaryProps> = ({children, resource, showPodSelector = false, showNodeSelector = false, showAnnotations = true, podSelector = 'spec.selector'}) => {
   const { metadata, type } = resource;
   const reference = referenceFor(resource);
   const model = modelFor(reference);
diff --git a/frontend/public/components/utils/error-boundary.tsx b/frontend/public/components/utils/error-boundary.tsx
index ea06e08edfb..7dba6fc96e4 100644
--- a/frontend/public/components/utils/error-boundary.tsx
+++ b/frontend/public/components/utils/error-boundary.tsx
@@ -37,7 +37,7 @@ export class ErrorBoundary extends React.Component<ErrorBoundaryProps, ErrorBoun
     const FallbackComponent = this.props.FallbackComponent || DefaultFallback;
     return hasError
       ? <FallbackComponent title={error.name} componentStack={errorInfo.componentStack} errorMessage={error.message} stack={error.stack} />
-      : <div>{this.props.children}</div>;
+      : <React.Fragment>{this.props.children}</React.Fragment>;
   }
 }
 
diff --git a/frontend/public/components/utils/file-input.tsx b/frontend/public/components/utils/file-input.tsx
index ed2f91e2e36..00c8a9e2121 100644
--- a/frontend/public/components/utils/file-input.tsx
+++ b/frontend/public/components/utils/file-input.tsx
@@ -1,7 +1,8 @@
+/* eslint-disable no-undef, no-unused-vars */
+
 import * as React from 'react';
 import * as classNames from 'classnames';
 import { NativeTypes } from 'react-dnd-html5-backend';
-// eslint-disable-next-line no-unused-vars
 import { DropTarget, ConnectDropTarget, DropTargetMonitor } from 'react-dnd';
 import withDragDropContext from './drag-drop-context';
 
@@ -41,7 +42,7 @@ export class FileInput extends React.Component<FileInputProps, FileInputState> {
     this.readFile(event.target.files[0]);
   }
   render() {
-    const { connectDropTarget, isOver, canDrop, id, isRequired } = this.props;
+    const { connectDropTarget, errorMessage, hideContents, isOver, canDrop, id, isRequired } = this.props;
     const klass = classNames('co-file-dropzone-container', {'co-file-dropzone--drop-over': isOver});
     return (
       connectDropTarget(
@@ -66,14 +67,14 @@ export class FileInput extends React.Component<FileInputProps, FileInputState> {
                 </span>
               </div>
               <p className="help-block" id={`${id}-help`}>{this.props.inputFieldHelpText}</p>
-              <textarea className="form-control co-file-dropzone__textarea"
+              {!hideContents && <textarea className="form-control co-file-dropzone__textarea"
                 onChange={this.onDataChange}
                 value={this.props.inputFileData}
                 aria-describedby={`${id}-textarea-help`}
                 required={isRequired}>
-              </textarea>
+              </textarea>}
               <p className="help-block" id={`${id}-textarea-help`}>{this.props.textareaFieldHelpText}</p>
-              { this.props.errorMessage && <div className="text-danger">{this.props.errorMessage}</div> }
+              { errorMessage && <div className="text-danger">{errorMessage}</div> }
             </div>
           </div>
         </div>
@@ -148,38 +149,42 @@ export const DroppableFileInput = withDragDropContext(class DroppableFileInput e
       inputFileName={this.state.inputFileName} />;
   }
 });
-/* eslint-disable no-undef */
+
 export type DroppableFileInputProps = {
-  inputFileData: string,
-  onChange: Function,
-  label: string,
-  id: string,
-  inputFieldHelpText: string,
-  textareaFieldHelpText: string,
-  isRequired: boolean,
+  inputFileData: string;
+  onChange: Function;
+  label: string;
+  id: string;
+  inputFieldHelpText: string;
+  textareaFieldHelpText: string;
+  isRequired: boolean;
+  hideContents?: boolean;
 };
+
 export type DroppableFileInputState = {
-  inputFileData: string,
-  inputFileName: string,
-  errorMessage?: any,
+  inputFileData: string;
+  inputFileName: string;
+  errorMessage?: any;
 };
+
 export type FileInputState = {
-  inputFileData: string,
-  inputFileName: string,
+  inputFileData: string;
+  inputFileName: string;
 };
+
 export type FileInputProps = {
-  errorMessage: string,
-  connectDropTarget?: ConnectDropTarget,
-  isOver?: boolean,
-  canDrop?: boolean,
-  onDrop: (props: FileInputProps, monitor: DropTargetMonitor) => void,
-  inputFileData: string,
-  inputFileName: string,
-  onChange: Function,
-  label: string,
-  id: string,
-  inputFieldHelpText: string,
-  textareaFieldHelpText: string,
-  isRequired: boolean,
+  errorMessage: string;
+  connectDropTarget?: ConnectDropTarget;
+  isOver?: boolean;
+  canDrop?: boolean;
+  onDrop: (props: FileInputProps, monitor: DropTargetMonitor) => void;
+  inputFileData: string;
+  inputFileName: string;
+  onChange: Function;
+  label: string;
+  id: string;
+  inputFieldHelpText: string;
+  textareaFieldHelpText: string;
+  isRequired: boolean;
+  hideContents?: boolean;
 };
-/* eslint-enable no-undef */
diff --git a/frontend/public/components/utils/headings.tsx b/frontend/public/components/utils/headings.tsx
index 311db0174f3..cd1cf4600b7 100644
--- a/frontend/public/components/utils/headings.tsx
+++ b/frontend/public/components/utils/headings.tsx
@@ -3,7 +3,7 @@ import * as classNames from 'classnames';
 import * as _ from 'lodash-es';
 import { Link } from 'react-router-dom';
 
-import { ActionsMenu, ResourceIcon, KebabAction } from './index';
+import { ActionsMenu, ResourceIcon, KebabAction, resourcePath } from './index';
 import { ClusterServiceVersionLogo } from '../operator-lifecycle-manager';
 import { connectToModel } from '../../kinds';
 import { ClusterServiceVersionModel } from '../../models';
@@ -48,7 +48,7 @@ export const PageHeading = connectToModel((props: PageHeadingProps) => {
 
   const logo = isCSV
     ? csvLogo()
-    : <div className="co-m-pane__name">{ kind && <ResourceIcon kind={kind} className="co-m-resource-icon--lg pull-left" /> } <span id="resource-title">{resourceTitle}</span></div>;
+    : <div className="co-m-pane__name">{ kind && <ResourceIcon kind={kind} className="co-m-resource-icon--lg" /> } <span id="resource-title">{resourceTitle}</span></div>;
   const hasButtonActions = !_.isEmpty(buttonActions);
   const hasMenuActions = !_.isEmpty(menuActions);
   const showActions = (hasButtonActions || hasMenuActions) && !_.isEmpty(data) && !_.get(data, 'deletionTimestamp');
@@ -73,8 +73,10 @@ export const SidebarSectionHeading: React.SFC<SidebarSectionHeadingProps> = ({te
 export const ResourceOverviewHeading: React.SFC<ResourceOverviewHeadingProps> = ({kindObj, actions, resource}) => <div className="overview__sidebar-pane-head resource-overview__heading">
   <h1 className="co-m-pane__heading">
     <div className="co-m-pane__name">
-      <ResourceIcon className="co-m-resource-icon--lg pull-left" kind={kindObj.kind} />
-      {resource.metadata.name}
+      <ResourceIcon className="co-m-resource-icon--lg" kind={kindObj.kind} />
+      <Link to={resourcePath(resource.kind, resource.metadata.name, resource.metadata.namespace)} className="co-resource-link__resource-name">
+        {resource.metadata.name}
+      </Link>
     </div>
     <div className="co-actions">
       <ActionsMenu actions={actions.map(a => a(kindObj, resource))} />
diff --git a/frontend/public/components/utils/horizontal-nav.tsx b/frontend/public/components/utils/horizontal-nav.tsx
index 84aff27b509..d0b8cb0cd44 100644
--- a/frontend/public/components/utils/horizontal-nav.tsx
+++ b/frontend/public/components/utils/horizontal-nav.tsx
@@ -101,6 +101,11 @@ export const navFactory: NavFactory = {
     name: 'Machine Configs',
     component,
   }),
+  machines: component => ({
+    href: 'machines',
+    name: 'Machines',
+    component,
+  }),
 };
 
 export const NavBar: React.SFC<NavBarProps> = ({pages, basePath, hideDivider}) => {
diff --git a/frontend/public/components/utils/index.tsx b/frontend/public/components/utils/index.tsx
index 60b955abaae..e4fad8f9aa7 100644
--- a/frontend/public/components/utils/index.tsx
+++ b/frontend/public/components/utils/index.tsx
@@ -47,7 +47,6 @@ export * from './k8s-watcher';
 export * from './workload-pause';
 export * from './list-dropdown';
 export * from './status-icon';
-
 /*
   Add the enum for NameValueEditorPair here and not in its namesake file because the editor should always be
   loaded asynchronously in order not to bloat the vendor file. The enum reference into the editor
diff --git a/frontend/public/components/utils/status-icon.tsx b/frontend/public/components/utils/status-icon.tsx
index e6f9833cd27..7341daf7403 100644
--- a/frontend/public/components/utils/status-icon.tsx
+++ b/frontend/public/components/utils/status-icon.tsx
@@ -9,12 +9,23 @@ export const StatusIcon: React.FunctionComponent<StatusIconProps> = ({status}) =
   }
 
   switch (status) {
+    case 'New':
+      return <span className="co-icon-and-text"><Icon type="fa" name="hourglass-1" className="co-icon-and-text__icon" /><CamelCaseWrap value={status} /></span>;
 
     case 'Pending':
       return <span className="co-icon-and-text"><Icon type="fa" name="hourglass-half" className="co-icon-and-text__icon" /><CamelCaseWrap value={status} /></span>;
 
-    case 'Expired':
+    case 'ContainerCreating':
+      return <span className="co-icon-and-text"><Icon type="pf" name="in-progress" className="co-icon-and-text__icon" /><CamelCaseWrap value={status} /></span>;
+
+    case 'In Progress':
+    case 'Running':
+    case 'Updating':
+    case 'Upgrading':
+      return <span className="co-icon-and-text"><Icon type="fa" name="refresh" className="co-icon-and-text__icon" /><CamelCaseWrap value={status} /></span>;
+
     case 'Cancelled':
+    case 'Expired':
     case 'Not Ready':
     case 'Terminating':
       return <span className="co-icon-and-text"><Icon type="fa" name="ban" className="co-icon-and-text__icon" /><CamelCaseWrap value={status} /></span>;
@@ -22,15 +33,6 @@ export const StatusIcon: React.FunctionComponent<StatusIconProps> = ({status}) =
     case 'Warning':
       return <span className="co-icon-and-text"><Icon type="pf" name="warning-triangle-o" className="co-icon-and-text__icon" /><CamelCaseWrap value={status} /></span>;
 
-    case 'Running':
-      return <span className="co-icon-and-text"><Icon type="fa" name="refresh" className="co-icon-and-text__icon" /><CamelCaseWrap value={status} /></span>;
-
-    case 'ContainerCreating':
-    case 'Updating':
-    case 'Upgrading':
-    case 'In Progress':
-      return <span className="co-icon-and-text"><Icon type="pf" name="in-progress" className="co-icon-and-text__icon" /><CamelCaseWrap value={status} /></span>;
-
     case 'ContainerCannotRun':
     case 'CrashLoopBackOff':
     case 'Critical':
@@ -54,9 +56,6 @@ export const StatusIcon: React.FunctionComponent<StatusIconProps> = ({status}) =
     case 'Unknown':
       return <span className="co-icon-and-text"><Icon type="pf" name="unknown" className="co-icon-and-text__icon" /><CamelCaseWrap value={status} /></span>;
 
-    case 'New':
-      return <span className="co-icon-and-text"><Icon type="fa" name="hourglass-1" className="co-icon-and-text__icon" /><CamelCaseWrap value={status} /></span>;
-
     default:
       return <span><CamelCaseWrap value={status} /></span>;
   }
diff --git a/frontend/public/const.js b/frontend/public/const.js
index 2967e16cd5b..00c1478275d 100644
--- a/frontend/public/const.js
+++ b/frontend/public/const.js
@@ -34,5 +34,5 @@ export const KUBE_ADMIN_USERNAME = 'kube:admin';
 export const OPERATOR_HUB_CSC_BASE = 'installed';
 export const RH_OPERATOR_SUPPORT_POLICY_LINK = 'https://access.redhat.com/third-party-software-support';
 
-// Package manifests for the Operator Hub use this label.
+// Package manifests for the OperatorHub use this label.
 export const OPERATOR_HUB_LABEL = 'openshift-marketplace';
diff --git a/frontend/public/extend/devconsole/OWNERS b/frontend/public/extend/devconsole/OWNERS
new file mode 100644
index 00000000000..19633ac8046
--- /dev/null
+++ b/frontend/public/extend/devconsole/OWNERS
@@ -0,0 +1,14 @@
+reviewers:
+  - abhinandan13jan
+  - Bumbilo
+  - debsmita1
+  - divyanshiGupta
+  - christianvogt
+  - joshuawilson
+  - karthikjeeyar
+  - rohitkrai03
+  - sahil143
+  - vikram-raj
+approvers:
+  - christianvogt
+  - joshuawilson
diff --git a/frontend/public/extend/devconsole/README.md b/frontend/public/extend/devconsole/README.md
new file mode 100644
index 00000000000..eb4d8f973b5
--- /dev/null
+++ b/frontend/public/extend/devconsole/README.md
@@ -0,0 +1,2 @@
+OpenShift Developer-Focused Web Console
+=========================
diff --git a/frontend/public/features.ts b/frontend/public/features.ts
index 4eed22d2a0f..d02e3d00874 100644
--- a/frontend/public/features.ts
+++ b/frontend/public/features.ts
@@ -55,7 +55,6 @@ export enum FLAGS {
   CAN_LIST_PV = 'CAN_LIST_PV',
   CAN_LIST_STORE = 'CAN_LIST_STORE',
   CAN_LIST_CRD = 'CAN_LIST_CRD',
-  CAN_LIST_MACHINE_CONFIG = 'CAN_LIST_MACHINE_CONFIG',
   CAN_CREATE_PROJECT = 'CAN_CREATE_PROJECT',
   SHOW_OPENSHIFT_START_GUIDE = 'SHOW_OPENSHIFT_START_GUIDE',
   SERVICE_CATALOG = 'SERVICE_CATALOG',
@@ -241,9 +240,6 @@ const ssarChecks = [{
 }, {
   flag: FLAGS.CAN_LIST_CRD,
   resourceAttributes:{ group: 'apiextensions.k8s.io', resource: 'customresourcedefinitions', verb: 'list' },
-}, {
-  flag: FLAGS.CAN_LIST_MACHINE_CONFIG,
-  resourceAttributes:{ group: MachineConfigModel.apiGroup, resource: MachineConfigModel.plural, verb: 'list' },
 }];
 
 ssarChecks.forEach(({flag, resourceAttributes, after}) => {
diff --git a/frontend/public/imgs/azure-red-hat-openshift-logo.svg b/frontend/public/imgs/azure-red-hat-openshift-logo.svg
new file mode 100644
index 00000000000..b1fc3637cc1
--- /dev/null
+++ b/frontend/public/imgs/azure-red-hat-openshift-logo.svg
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="166px" height="40px" viewBox="0 0 166 40" style="enable-background:new 0 0 166 40;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#FFFFFF;}
+	.st1{fill:#A30000;}
+	.st2{fill:#CC0000;}
+	.st3{fill:#820000;}
+</style>
+<g>
+	<g>
+		<path class="st0" d="M58.2,21.1l-1.7-3.3h-1.1v3.4h-2.7v-10h4.4c0.6,0,1.1,0.1,1.6,0.2c0.5,0.1,0.9,0.3,1.3,0.6
+			c0.3,0.2,0.6,0.6,0.8,1c0.2,0.4,0.3,0.9,0.3,1.4c0,0.8-0.2,1.4-0.5,1.8c-0.3,0.5-0.8,0.8-1.3,1l2,3.8L58.2,21.1L58.2,21.1z
+			 M58.1,13.7c-0.2-0.2-0.5-0.3-1-0.3h-1.7v2.2h1.7c0.5,0,0.8-0.1,1-0.3c0.2-0.2,0.3-0.5,0.3-0.8C58.3,14.2,58.3,13.9,58.1,13.7z"/>
+		<path class="st0" d="M63.3,21.1v-9.9h7.6v2.3H66v1.4h3v2.2h-3v1.7h5v2.3H63.3z"/>
+		<path class="st0" d="M81.5,18.4c-0.2,0.6-0.6,1.2-1,1.5c-0.5,0.4-1,0.6-1.7,0.8c-0.6,0.2-1.4,0.2-2.3,0.2h-3.2v-9.8h3.6
+			c0.8,0,1.4,0.1,2.2,0.2c0.6,0.2,1.2,0.4,1.6,0.8c0.4,0.3,0.8,0.9,1,1.5c0.2,0.6,0.3,1.4,0.3,2.4S81.7,17.8,81.5,18.4z M78.8,15
+			c-0.1-0.3-0.2-0.6-0.4-0.8c-0.2-0.2-0.4-0.3-0.7-0.5c-0.3-0.1-0.6-0.2-1-0.2h-0.7v5.2h0.6c0.4,0,0.8-0.1,1-0.1
+			c0.3-0.1,0.6-0.2,0.8-0.4c0.2-0.2,0.3-0.5,0.4-0.8s0.1-0.8,0.1-1.3C79,15.6,78.9,15.3,78.8,15z"/>
+		<path class="st0" d="M94.8,21.1v-3.9h-3v3.9H89v-9.9h2.8v3.6h3v-3.6h2.8v9.9H94.8z"/>
+		<path class="st0" d="M106.5,21.1l-0.6-1.8h-3l-0.6,1.8h-3l3.6-9.9h2.8l3.6,9.9H106.5z M105.1,16.5c-0.1-0.3-0.2-0.6-0.2-0.8
+			c-0.1-0.2-0.1-0.5-0.2-0.6c-0.1-0.2-0.1-0.3-0.1-0.6c-0.1-0.2-0.1-0.3-0.1-0.5c0,0.2-0.1,0.3-0.1,0.5c-0.1,0.2-0.1,0.3-0.1,0.6
+			c-0.1,0.2-0.1,0.4-0.2,0.6c-0.1,0.2-0.1,0.6-0.2,0.8l-0.2,0.6h1.7L105.1,16.5z"/>
+		<path class="st0" d="M115.1,13.6v7.5h-2.8v-7.5h-2.8v-2.4h8.3v2.4H115.1z"/>
+		<path class="st0" d="M121.5,12.9c-0.1,0.2-0.2,0.3-0.3,0.4c-0.1,0.1-0.2,0.2-0.4,0.3c-0.2,0.1-0.3,0.1-0.6,0.1
+			c-0.2,0-0.3-0.1-0.6-0.1c-0.2-0.1-0.3-0.2-0.4-0.3c-0.1-0.1-0.2-0.2-0.3-0.4c-0.1-0.2-0.1-0.3-0.1-0.6c0-0.2,0.1-0.3,0.1-0.6
+			c0.1-0.2,0.2-0.3,0.3-0.4c0.1-0.1,0.2-0.2,0.4-0.3c0.2-0.1,0.3-0.1,0.6-0.1c0.2,0,0.3,0.1,0.6,0.1c0.2,0.1,0.3,0.2,0.4,0.3
+			c0.1,0.1,0.2,0.2,0.3,0.4c0.1,0.2,0.1,0.3,0.1,0.6C121.6,12.6,121.6,12.7,121.5,12.9z M121.4,12c-0.1-0.1-0.1-0.2-0.2-0.3
+			c-0.1-0.1-0.2-0.2-0.3-0.2c-0.1-0.1-0.3-0.1-0.4-0.1c-0.2,0-0.3,0-0.4,0.1c-0.1,0.1-0.2,0.1-0.3,0.2c-0.1,0.1-0.2,0.2-0.2,0.3
+			s-0.1,0.3-0.1,0.4c0,0.2,0,0.3,0.1,0.4c0.1,0.1,0.1,0.2,0.2,0.3c0.1,0.1,0.2,0.2,0.3,0.2c0.1,0.1,0.3,0.1,0.4,0.1
+			c0.2,0,0.3,0,0.4-0.1c0.1-0.1,0.2-0.1,0.3-0.2c0.1-0.1,0.2-0.2,0.2-0.3c0.1-0.1,0.1-0.3,0.1-0.4C121.5,12.3,121.5,12.1,121.4,12z
+			 M120.9,12.3c-0.1,0.1-0.1,0.1-0.2,0.1L121,13h-0.3l-0.3-0.6H120V13h-0.2v-1.4h0.6c0.1,0,0.1,0,0.2,0c0.1,0,0.1,0.1,0.1,0.1
+			l0.1,0.1c0,0.1,0.1,0.1,0.1,0.2C121,12.2,121,12.3,120.9,12.3z M120.7,11.9c-0.1-0.1-0.1-0.1-0.2-0.1h-0.3v0.4h0.3
+			c0.1,0,0.1,0,0.2-0.1C120.7,12.1,120.7,12.1,120.7,11.9C120.7,12,120.7,12,120.7,11.9z"/>
+		<path class="st0" d="M64,34.4c-0.3,1-0.7,1.8-1.3,2.4c-0.6,0.7-1.2,1.3-1.9,1.6c-0.7,0.3-1.6,0.6-2.6,0.6c-1,0-1.8-0.2-2.6-0.6
+			s-1.4-0.9-1.9-1.6c-0.6-0.7-1-1.4-1.3-2.4c-0.3-1-0.4-1.9-0.4-3s0.2-2.2,0.5-3c0.3-1,0.7-1.8,1.3-2.4c0.6-0.7,1.2-1.3,1.9-1.6
+			c0.8-0.3,1.6-0.6,2.6-0.6c1,0,1.8,0.2,2.6,0.6c0.8,0.3,1.4,0.9,1.9,1.6c0.6,0.7,1,1.4,1.3,2.4c0.3,1,0.5,1.9,0.5,3
+			C64.4,32.5,64.3,33.5,64,34.4z M62.4,28.9c-0.2-0.8-0.6-1.4-1-1.9c-0.4-0.6-0.9-1-1.4-1.3c-0.6-0.3-1.2-0.4-1.8-0.4
+			s-1.3,0.1-1.8,0.4c-0.6,0.3-1,0.7-1.4,1.3c-0.4,0.6-0.7,1.2-1,1.9c-0.2,0.7-0.3,1.5-0.3,2.5c0,1,0.1,1.8,0.3,2.6s0.6,1.4,1,1.9
+			c0.4,0.6,0.9,1,1.4,1.3c0.6,0.3,1.2,0.4,1.8,0.4c0.6,0,1.3-0.1,1.8-0.4c0.6-0.3,1-0.7,1.4-1.3c0.4-0.6,0.7-1.2,1-1.9
+			c0.2-0.8,0.3-1.6,0.3-2.6S62.7,29.6,62.4,28.9z"/>
+		<path class="st0" d="M77.7,30.3c-0.2,0.6-0.6,1-1,1.4c-0.4,0.4-1,0.7-1.6,0.9C74.4,32.8,73.8,33,73,33h-3.6v5.8h-1.7V23.9h5.5
+			c0.7,0,1.3,0.1,1.9,0.3c0.6,0.2,1,0.5,1.4,0.8c0.4,0.3,0.8,0.8,1,1.4c0.2,0.6,0.3,1.3,0.3,1.9C77.9,29.1,77.9,29.8,77.7,30.3z
+			 M75.6,26.3c-0.6-0.6-1.3-0.8-2.4-0.8h-3.8v6h3.7c2.2,0,3.4-1,3.4-3C76.3,27.5,76.1,26.7,75.6,26.3z"/>
+		<path class="st0" d="M80.9,38.8V23.9h9v1.5h-7.4v4.6h4.2v1.5h-4.2v5.7h7.7v1.5H80.9L80.9,38.8z"/>
+		<path class="st0" d="M102.5,38.8L96,28.7c-0.1-0.1-0.2-0.3-0.3-0.5c-0.1-0.2-0.2-0.3-0.3-0.6c-0.1-0.2-0.2-0.3-0.3-0.5
+			c-0.1-0.2-0.2-0.3-0.2-0.3v1v11h-1.6v-15h1.6l6.4,10.4c0.1,0.1,0.2,0.3,0.3,0.5c0.1,0.2,0.2,0.3,0.3,0.6c0.2,0.2,0.2,0.3,0.3,0.5
+			c0.1,0.2,0.2,0.3,0.2,0.3v-1V23.9h1.6v14.9H102.5z"/>
+		<path class="st0" d="M116.7,36.6c-0.2,0.6-0.6,1-1,1.3c-0.4,0.3-1,0.6-1.5,0.9c-0.6,0.2-1.3,0.3-2.1,0.3c-1,0-1.9-0.2-2.8-0.6
+			c-0.9-0.4-1.6-0.9-2.2-1.4l1.1-1.3c0.6,0.6,1.2,1,1.8,1.3c0.6,0.3,1.4,0.5,2.2,0.5c1,0,1.8-0.2,2.4-0.7c0.6-0.5,0.9-1,0.9-1.9
+			c0-0.3-0.1-0.6-0.2-1s-0.3-0.6-0.6-0.8c-0.3-0.2-0.6-0.5-1.1-0.7c-0.5-0.2-1-0.5-1.7-0.7c-0.8-0.3-1.4-0.6-2-0.9
+			c-0.6-0.3-1-0.6-1.3-1c-0.3-0.3-0.6-0.7-0.7-1.1c-0.2-0.4-0.2-0.9-0.2-1.4c0-0.6,0.1-1.1,0.3-1.6c0.2-0.5,0.6-0.9,1-1.2
+			s0.9-0.6,1.4-0.8c0.6-0.2,1.2-0.2,1.9-0.2c1,0,1.8,0.1,2.6,0.4s1.4,0.6,2,1.2l-1,1.3c-0.6-0.5-1-0.8-1.7-1
+			c-0.6-0.2-1.2-0.3-1.9-0.3c-0.6,0-1,0.1-1.3,0.2c-0.3,0.1-0.6,0.3-0.9,0.5c-0.2,0.2-0.4,0.4-0.6,0.7c-0.1,0.2-0.2,0.6-0.2,0.8
+			c0,0.2,0.1,0.6,0.1,0.8c0.1,0.2,0.2,0.5,0.6,0.7c0.3,0.2,0.6,0.5,1,0.7c0.5,0.2,1,0.5,1.8,0.8c0.8,0.3,1.5,0.6,2.1,0.9
+			c0.6,0.3,1,0.6,1.3,1c0.3,0.3,0.6,0.8,0.7,1.2c0.2,0.4,0.2,0.9,0.2,1.4C117.1,35.5,117,36,116.7,36.6z"/>
+		<path class="st0" d="M129.6,38.8v-7h-7.4v7h-1.7V23.9h1.7v6.4h7.4v-6.4h1.7v14.9H129.6z"/>
+		<path class="st0" d="M135.3,38.8V23.9h1.7v14.9C137,38.8,135.3,38.8,135.3,38.8z"/>
+		<path class="st0" d="M142.7,25.5v5h4.1v1.5h-4.1v6.9H141V23.9h8.7v1.5H142.7z"/>
+		<path class="st0" d="M157.8,25.5v13.4h-1.7V25.5h-4.4v-1.5h10.4v1.5H157.8z"/>
+		<path class="st0" d="M165.9,25.7c-0.1,0.2-0.2,0.3-0.3,0.4c-0.1,0.1-0.2,0.2-0.4,0.3c-0.2,0.1-0.3,0.1-0.6,0.1
+			c-0.2,0-0.3-0.1-0.6-0.1c-0.2-0.1-0.3-0.2-0.4-0.3c-0.1-0.1-0.2-0.2-0.3-0.4c-0.1-0.2-0.1-0.3-0.1-0.6c0-0.2,0.1-0.3,0.1-0.6
+			c0.1-0.2,0.2-0.3,0.3-0.4c0.2-0.1,0.2-0.2,0.4-0.3c0.2-0.1,0.3-0.1,0.6-0.1c0.2,0,0.3,0.1,0.6,0.1c0.2,0.1,0.3,0.2,0.4,0.3
+			c0.1,0.2,0.2,0.2,0.3,0.4c0.1,0.2,0.1,0.3,0.1,0.6C166,25.4,165.9,25.5,165.9,25.7z M165.7,24.7c-0.1-0.1-0.1-0.2-0.2-0.3
+			c-0.1-0.1-0.2-0.2-0.3-0.2c-0.1-0.1-0.3-0.1-0.4-0.1c-0.2,0-0.3,0-0.4,0.1c-0.1,0.1-0.2,0.1-0.3,0.2c-0.1,0.2-0.2,0.2-0.2,0.3
+			c-0.1,0.1-0.1,0.3-0.1,0.4c0,0.2,0,0.3,0.1,0.4c0.1,0.1,0.1,0.2,0.2,0.3c0.1,0.1,0.2,0.2,0.3,0.2c0.1,0.1,0.3,0.1,0.4,0.1
+			c0.2,0,0.3,0,0.4-0.1c0.1-0.1,0.2-0.1,0.3-0.2c0.1-0.1,0.2-0.2,0.2-0.3c0.1-0.1,0.1-0.3,0.1-0.4C165.7,25.1,165.7,24.9,165.7,24.7
+			z M165.2,25.1c-0.1,0.1-0.1,0.1-0.2,0.1l0.3,0.6h-0.3l-0.3-0.6h-0.3v0.6h-0.1v-1.4h0.6c0.1,0,0.1,0,0.2,0c0.1,0,0.1,0.1,0.1,0.1
+			l0.1,0.1c0,0.1,0.1,0.1,0.1,0.2C165.2,25,165.2,25.1,165.2,25.1z M165,24.7c-0.1-0.1-0.1-0.1-0.2-0.1h-0.3v0.4h0.3
+			c0.1,0,0.1,0,0.2-0.1S165.1,24.9,165,24.7C165,24.8,165,24.7,165,24.7z"/>
+	</g>
+	<g>
+		<path class="st1" d="M12.6,17.9l-7,2.6c0.1,1.1,0.3,2.2,0.6,3.3l6.6-2.4C12.6,20.3,12.5,19.1,12.6,17.9"/>
+		<path class="st1" d="M43.5,10.2c-0.5-1-1-1.9-1.7-2.9l-7,2.6c0.8,0.8,1.4,1.8,2.1,2.8L43.5,10.2z"/>
+		<path class="st2" d="M28.1,8.3c1.4,0.6,2.7,1.6,3.8,2.6l7-2.6c-1.9-2.7-4.6-5-7.8-6.5C21.1-2.8,9.2,1.6,4.6,11.5
+			c-1.5,3.3-2.1,6.7-1.8,10l7-2.6c0.1-1.5,0.5-3,1.2-4.5C13.8,8,21.6,5.2,28.1,8.3"/>
+		<path class="st2" d="M6.6,23.6L0,26c0.6,2.4,1.7,4.7,3.1,6.7l7-2.6C8.2,28.5,7.1,26.1,6.6,23.6"/>
+		<path class="st2" d="M35.5,21.1c-0.1,1.5-0.5,3-1.2,4.5c-3,6.5-10.7,9.3-17.3,6.2c-1.4-0.6-2.7-1.6-3.8-2.6l-6.9,2.5
+			c1.9,2.7,4.6,5,7.8,6.5c10,4.7,21.8,0.3,26.6-9.6c1.5-3.3,2.1-6.6,1.8-10L35.5,21.1z"/>
+		<path class="st2" d="M37.3,12.5l-6.6,2.4c1.3,2.2,1.8,4.7,1.6,7.4l7-2.6C39,17.2,38.4,14.7,37.3,12.5"/>
+		<path class="st3" d="M12.6,19.4c0-0.5,0-1,0-1.4l-6.9,2.6c0.1,0.5,0.1,0.9,0.2,1.4L12.6,19.4z"/>
+		<path class="st3" d="M42.5,8.4c-0.2-0.3-0.5-0.7-0.7-1l-7,2.6c0.3,0.3,0.6,0.6,0.9,1L42.5,8.4z"/>
+		<path class="st1" d="M6.4,31.6c0.6,0.8,1.1,1.4,1.8,2.2l7.5-2.8c-0.9-0.6-1.7-1.2-2.4-1.9L6.4,31.6z M42.5,18.5l-7,2.6
+			c-0.1,1-0.3,2-0.6,3l7.5-2.8C42.6,20.3,42.6,19.5,42.5,18.5"/>
+	</g>
+	<g>
+		<path class="st0" d="M58.3,8.5l-0.6-1.8h-3l-0.6,1.8H53l2.6-7.4h1.2l2.7,7.4H58.3z M56.7,4c-0.2-0.6-0.5-1.4-0.6-1.7
+			c-0.1,0.3-0.3,1.2-0.6,1.7l-0.6,1.7h2.3L56.7,4z"/>
+		<path class="st0" d="M60.7,8.5V7.6l2.4-3c0.2-0.3,0.6-0.6,0.6-0.8c-0.2,0-0.7,0-1,0h-1.8v-1h4.1v0.9l-2.4,3
+			c-0.2,0.3-0.6,0.6-0.6,0.8c0.2,0,0.8,0,1,0h2v1C64.9,8.5,60.7,8.5,60.7,8.5z"/>
+		<path class="st0" d="M69.7,8.5V7.9c-0.3,0.4-0.8,0.6-1.4,0.6c-1.3,0-2-0.8-2-2.5V2.9h1.1V6c0,1.1,0.4,1.5,1.1,1.5
+			c0.7,0,1.1-0.6,1.1-1.4V2.9h1.1v5.6H69.7z"/>
+		<path class="st0" d="M75.5,4.1C75.2,4,75,3.9,74.7,3.9c-0.7,0-1.1,0.5-1.1,1.4v3.2h-1.1V3h1.1v0.6c0.2-0.3,0.7-0.6,1.3-0.6
+			c0.5,0,0.7,0.1,1,0.2L75.5,4.1z"/>
+		<path class="st0" d="M81.1,6.1h-3.8c0.1,1,0.7,1.5,1.4,1.5c0.5,0,0.8-0.2,1.3-0.5l0.6,0.7c-0.5,0.5-1,0.7-1.9,0.7
+			c-1.3,0-2.4-1-2.4-2.9c0-1.9,1-2.9,2.4-2.9c1.6,0,2.4,1.3,2.4,2.8C81.1,5.8,81.1,5.9,81.1,6.1z M78.7,3.8c-0.7,0-1.2,0.6-1.3,1.4
+			h2.6C79.9,4.4,79.5,3.8,78.7,3.8z"/>
+	</g>
+</g>
+</svg>
diff --git a/frontend/public/index.html b/frontend/public/index.html
index 84b1ff5dc8e..aa1d9592e39 100644
--- a/frontend/public/index.html
+++ b/frontend/public/index.html
@@ -25,6 +25,10 @@
     <title>OpenShift Dedicated</title>
     <meta name="application-name" content="OpenShift Dedicated">
     [[ end ]]
+    [[ if eq .Branding "azure" ]]
+    <title>Azure Red Hat OpenShift</title>
+    <meta name="application-name" content="Azure Red Hat OpenShift">
+    [[ end ]]
 
     [[ if eq .Branding "okd" ]]
     <link rel="shortcut icon" href="<%= require('./imgs/okd-favicon.png') %>">
diff --git a/frontend/public/module/k8s/cluster-operator.ts b/frontend/public/module/k8s/cluster-operator.ts
index ca509f32b2c..b08f024af26 100644
--- a/frontend/public/module/k8s/cluster-operator.ts
+++ b/frontend/public/module/k8s/cluster-operator.ts
@@ -1,6 +1,6 @@
 /* eslint-disable no-unused-vars, no-undef */
 import * as _ from 'lodash-es';
-import { K8sResourceKind } from '.';
+import { ClusterOperator, OperandVersion } from '.';
 
 export enum OperatorStatus {
   Available = 'Available',
@@ -9,7 +9,7 @@ export enum OperatorStatus {
   Unknown = 'Unknown',
 }
 
-export const getStatusAndMessage = (operator: K8sResourceKind) => {
+export const getStatusAndMessage = (operator: ClusterOperator) => {
   const conditions = _.get(operator, 'status.conditions');
   const failing: any = _.find(conditions, { type: 'Failing', status: 'True' });
   if (failing) {
@@ -29,7 +29,13 @@ export const getStatusAndMessage = (operator: K8sResourceKind) => {
   return { status: OperatorStatus.Unknown, message: '' };
 };
 
-export const getClusterOperatorStatus = (operator: K8sResourceKind) => {
+export const getClusterOperatorStatus = (operator: ClusterOperator) => {
   const { status } = getStatusAndMessage(operator);
   return status;
 };
+
+export const getClusterOperatorVersion = (operator: ClusterOperator) => {
+  const versions: OperandVersion[] = _.get(operator, 'status.versions', []);
+  const operatorVersion = _.find(versions, v => v.name === 'operator');
+  return operatorVersion ? operatorVersion.version : '';
+};
diff --git a/frontend/public/module/k8s/cluster-settings.ts b/frontend/public/module/k8s/cluster-settings.ts
new file mode 100644
index 00000000000..77539d7b364
--- /dev/null
+++ b/frontend/public/module/k8s/cluster-settings.ts
@@ -0,0 +1,66 @@
+/* eslint-disable no-unused-vars, no-undef */
+import * as _ from 'lodash-es';
+
+import { ClusterVersionModel } from '../../models';
+import { referenceForModel } from './k8s';
+import { ClusterVersionKind, ClusterUpdate, ClusterVersionConditionType, K8sResourceConditionStatus, ClusterVersionCondition } from '.';
+
+export enum ClusterUpdateStatus {
+  UpToDate = 'Up to Date',
+  UpdatesAvailable = 'Updates Available',
+  Updating = 'Updating',
+  Failing = 'Failing',
+  ErrorRetrieving = 'Error Retrieving',
+}
+
+export const clusterVersionReference = referenceForModel(ClusterVersionModel);
+
+export const getAvailableClusterUpdates = (cv: ClusterVersionKind): ClusterUpdate[] => {
+  return _.get(cv, 'status.availableUpdates', []);
+};
+
+export const getAvailableClusterChannels = () => ({'nightly-4.0': 'nightly-4.0', 'pre-release-4.0': 'pre-release-4.0', 'stable-4.0': 'stable-4.0'});
+
+export const getDesiredClusterVersion = (cv: ClusterVersionKind): string => {
+  return _.get(cv, 'status.desired.version');
+};
+
+export const getClusterVersionCondition = (cv: ClusterVersionKind, type: ClusterVersionConditionType, status: K8sResourceConditionStatus = undefined): ClusterVersionCondition => {
+  const conditions: ClusterVersionCondition[] = _.get(cv, 'status.conditions');
+  if (status) {
+    return _.find(conditions, {type, status});
+  }
+  return _.find(conditions, {type});
+};
+
+export const isProgressing = (cv: ClusterVersionKind): boolean => {
+  return !_.isEmpty(getClusterVersionCondition(cv, ClusterVersionConditionType.Progressing, K8sResourceConditionStatus.True));
+};
+
+export const failedToRetrieveUpdates = (cv: ClusterVersionKind): boolean => {
+  return !_.isEmpty(getClusterVersionCondition(cv, ClusterVersionConditionType.RetrievedUpdates, K8sResourceConditionStatus.False));
+};
+
+export const updateFailing = (cv: ClusterVersionKind): boolean => {
+  return !_.isEmpty(getClusterVersionCondition(cv, ClusterVersionConditionType.Failing, K8sResourceConditionStatus.True));
+};
+
+export const hasAvailableUpdates = (cv: ClusterVersionKind): boolean => {
+  return !_.isEmpty(getAvailableClusterUpdates(cv));
+};
+
+export const getClusterUpdateStatus = (cv: ClusterVersionKind): ClusterUpdateStatus => {
+  if (updateFailing(cv)) {
+    return ClusterUpdateStatus.Failing;
+  }
+
+  if (failedToRetrieveUpdates(cv)) {
+    return ClusterUpdateStatus.ErrorRetrieving;
+  }
+
+  if (isProgressing(cv)) {
+    return ClusterUpdateStatus.Updating;
+  }
+
+  return hasAvailableUpdates(cv) ? ClusterUpdateStatus.UpdatesAvailable : ClusterUpdateStatus.UpToDate;
+};
diff --git a/frontend/public/module/k8s/index.ts b/frontend/public/module/k8s/index.ts
index 7290384e0a1..c5dd2c49adc 100644
--- a/frontend/public/module/k8s/index.ts
+++ b/frontend/public/module/k8s/index.ts
@@ -11,6 +11,7 @@ export * from './get-resources';
 export * from './k8s-models';
 export * from './label-selector';
 export * from './cluster-operator';
+export * from './cluster-settings';
 
 export type OwnerReference = {
   name: string;
@@ -214,7 +215,7 @@ export type MachineConfigPoolKind = {
   status: MachineConfigPoolStatus;
 } & K8sResourceKind;
 
-type ClusterUpdate = {
+export type ClusterUpdate = {
   image: string;
   version: string;
 };
@@ -227,18 +228,52 @@ type UpdateHistory = {
   image: string;
 };
 
+export enum ClusterVersionConditionType {
+  Available = 'Available',
+  Failing = 'Failing',
+  Progressing = 'Progressing',
+  RetrievedUpdates = 'RetrievedUpdates',
+}
+
+export type ClusterVersionCondition = K8sResourceCondition<ClusterVersionConditionType>;
+
+type ClusterVersionStatus = {
+  availableUpdates: ClusterUpdate[];
+  conditions: ClusterVersionCondition[];
+  desired: ClusterUpdate;
+  history: UpdateHistory[];
+};
+
+type ClusterVersionSpec = {
+  channel: string;
+  clusterID: string;
+  desiredUpdate: ClusterUpdate;
+  upstream: string;
+};
+
 export type ClusterVersionKind = {
-  spec: {
-    channel: string;
-    clusterID: string;
-    desiredUpdate: ClusterUpdate;
-    upstream: string;
-  };
+  spec: ClusterVersionSpec;
+  status: ClusterVersionStatus;
+} & K8sResourceKind;
+
+export type OperandVersion = {
+  name: string;
+  version: string;
+};
+
+type ClusterOperatorObjectReference = {
+  group: string;
+  resource: string;
+  namespace?: string;
+  name: string;
+};
+
+export type ClusterOperator = {
+  spec: {};
   status: {
-    availableUpdates: ClusterUpdate[];
-    conditions: any[];
-    desired: ClusterUpdate;
-    history: UpdateHistory[];
+    conditions?: any[];
+    versions?: OperandVersion[];
+    relatedObjects?: ClusterOperatorObjectReference[];
   };
 } & K8sResourceKind;
 
diff --git a/frontend/public/style/OWNERS b/frontend/public/style/OWNERS
new file mode 100644
index 00000000000..e07e60bf9aa
--- /dev/null
+++ b/frontend/public/style/OWNERS
@@ -0,0 +1,7 @@
+reviewers:
+  - rhamilto
+  - sg00dwin
+approvers:
+  - rhamilto
+  - sg00dwin
+  - spadgett
diff --git a/frontend/public/style/_common.scss b/frontend/public/style/_common.scss
index ffd094ca88e..0f36ce6b8b9 100644
--- a/frontend/public/style/_common.scss
+++ b/frontend/public/style/_common.scss
@@ -101,6 +101,8 @@
 
 .co-m-pane__name {
   @include co-break-word;
+  align-items: baseline;
+  display: flex;
   flex: 1;
   margin-right: 10px;
   min-width: 0; // necessary for wrapping since its a flex child
@@ -166,11 +168,19 @@
   }
 }
 
+.co-m-pane__dropdown {
+  margin-bottom: 20px;
+}
+
 .co-m-pane__explanation {
   color: $color-pf-black-600;
   margin-bottom: 30px;
 }
 
+.co-m-pane__explanation--alt {
+  margin-bottom: 20px;
+}
+
 .co-help-text {
   color: $color-pf-black-600;
 }
@@ -365,6 +375,11 @@
   text-overflow: ellipsis;
 }
 
+.co-select-to-copy {
+  cursor: copy;
+  user-select: all;
+}
+
 .co-nowrap {
   white-space: nowrap;
 }
@@ -396,18 +411,20 @@
   outline: none;
   padding-right:  20px;
   position: relative;
-  &:after {
+  &::after {
     color: $color-pf-black-600;
     content: $pficon-var-edit;
     font-family: $icon-font-name-pf;
+    line-height: 1;
     pointer-events: none;
     position: absolute;
     right: 0;
+    top: 0;
   }
-  &:focus {
-    outline: none;
+  &.btn-link::after {
+    top: 5px;
   }
-  &:hover:after {
+  &:hover::after {
     color: $color-pf-black-700;
   }
 }
diff --git a/frontend/public/style/_layout.scss b/frontend/public/style/_layout.scss
index 3da309f7c67..fca95d70cbb 100644
--- a/frontend/public/style/_layout.scss
+++ b/frontend/public/style/_layout.scss
@@ -10,6 +10,7 @@ body,
 #content {
   display: flex;
   flex-direction: column;
+  font-size: $font-size-base; // so PatternFly 4's PatternFly 3 shield rules don't override
 }
 
 #content-scrollable {
@@ -19,10 +20,6 @@ body,
   -webkit-overflow-scrolling: touch;
 }
 
-.pf-c-page__main-section {
-  --pf-global--FontSize--md: #{$font-size-base};
-}
-
 .absolute-zero {
   position: absolute;
   top: 0px;
diff --git a/frontend/public/style/_overrides.scss b/frontend/public/style/_overrides.scss
index 12bbf98cabf..32ab8a607e3 100644
--- a/frontend/public/style/_overrides.scss
+++ b/frontend/public/style/_overrides.scss
@@ -227,8 +227,6 @@ tags-input .autocomplete .suggestion-item em {
   }
 }
 
-
-
 .modal.right-side-modal-pf {
   top: 76px; // since PatternFly 4's masthead is taller than PatternFly 3's
 
@@ -258,14 +256,26 @@ tags-input .autocomplete .suggestion-item em {
 
 // PatternFly 4 overrides
 
+// Webpack will not properly bundle the background-image from PatternFly
+@media only screen and (min-width: 576px) {
+  .pf-c-about-modal-box__hero {
+    background-image: url('../imgs/pfbg_992.jpg') !important;
+  }
+}
+
 .pf-c-dropdown__menu {
   list-style: none;
 }
 
-.pf-c-page {
-  // TEMP fix until https://github.com/patternfly/patternfly-next/issues/1174 is fixed upstream
-  height: 100% !important;
+// TEMP fix until https://github.com/patternfly/patternfly-next/issues/1543 is fixed upstream
+.pf-c-dropdown__menu-item {
+  &:focus,
+  &:hover {
+    color: var(--pf-global--Color--dark-100);
+  }
+}
 
+.pf-c-page {
   &__header {
     background-color: var(--pf-global--BackgroundColor--dark-200);
     background-image: url("../imgs/pfbg_2000.jpg");
@@ -280,11 +290,10 @@ tags-input .autocomplete .suggestion-item em {
 
   // `.pf-c-page` specificity required
   .pf-c-page__main-section {
-    --pf-c-page__main-section--Padding: 0;
-
-    @media screen and (min-width: $grid-float-breakpoint) {
-      --pf-c-page__main-section--Padding: 0;
-    }
+    --pf-c-page__main-section--PaddingBottom: 0;
+    --pf-c-page__main-section--PaddingLeft: 0;
+    --pf-c-page__main-section--PaddingRight: 0;
+    --pf-c-page__main-section--PaddingTop: 0;
   }
 
   .pf-c-page__sidebar {
@@ -336,11 +345,13 @@ tags-input .autocomplete .suggestion-item em {
     --pf-c-nav__simple-list-link--focus--BackgroundColor: var(--pf-c-nav__list-link--hover--BackgroundColor);
     --pf-c-nav__simple-list-link--focus--Color: var(--pf-c-nav__list-link--hover--Color);
     --pf-c-nav__simple-list-link--focus--FontWeight: var(--pf-global--FontWeight--normal);
+    --pf-c-nav__simple-list-link--hover--BackgroundColor: var(--pf-c-nav__list-link--hover--BackgroundColor);
+    --pf-c-nav__simple-list-link--hover--Color: var(--pf-c-nav__list-link--hover--Color);
     --pf-c-nav__simple-list-link--m-current--BackgroundColor: var(--pf-c-nav__list-link--hover--BackgroundColor);
     --pf-c-nav__simple-list-link--m-current--Color: var(--pf-c-nav__simple-list-link--active--Color);
     --pf-c-nav__simple-list-link--PaddingBottom: 2px;
     --pf-c-nav__simple-list-link--PaddingRight: 5px;
-    --pf-c-nav__simple-list-link--PaddingTop: 4px;
+    --pf-c-nav__simple-list-link--PaddingTop: 2px;
     // Subnav
     --pf-c-nav__subnav--MarginTop: 0;
     --pf-c-nav__subnav--MaxHeight: 100%;
@@ -348,11 +359,13 @@ tags-input .autocomplete .suggestion-item em {
     --pf-c-nav__list-toggle--PaddingRight: 0;
   }
 
-  .pf-c-nav__item .pf-c-nav__simple-list .pf-c-nav__link {
-    --pf-c-nav__subnav-item--PaddingLeft: var(--pf-c-nav__list-link--PaddingLeft);
+  .pf-c-nav__item .pf-c-nav__simple-list .pf-c-nav__link.pf-m-separator::after {
+    --pf-c-nav__simple-list-link--m-separator--after--Left: var(--pf-c-nav__list-link--PaddingLeft);
+    right: var(--pf-c-nav__list-link--PaddingRight);
 
     @media screen and (min-width: $grid-float-breakpoint) {
-      --pf-c-nav__subnav-item--PaddingLeft: var(--pf-c-nav__list-link--md--PaddingLeft);
+      --pf-c-nav__simple-list-link--m-separator--after--Left: var(--pf-c-nav__list-link--md--PaddingLeft);
+      right: var(--pf-c-nav__list-link--md--PaddingRight);
     }
   }
 
@@ -360,18 +373,25 @@ tags-input .autocomplete .suggestion-item em {
     list-style: none; // turn off list-styles to fix bug in Edge
     > .pf-c-nav__item {
       border-bottom: 1px solid #{$color-pf-black};
-      font-size: 14px;
       margin-top: 0;
 
+      &:not(.pf-m-current) > .pf-c-nav__link {
+        &:active,
+        &:focus,
+        &:hover {
+          background-color: var(--pf-c-nav__list-link--hover--BackgroundColor);
+        }
+      }
+
       &.pf-m-current {
         background-color: #{$color-pf-black-800};
 
-        &:not(.pf-m-expanded) {
-          .pf-c-nav__link {
-            &::after {
-              display: block;
-            }
-          }
+        &.pf-m-expanded > .pf-c-nav__link::after {
+          display: none;
+        }
+
+        .pf-c-nav__simple-list .pf-c-nav__link.pf-m-separator:after {
+          --pf-c-nav__simple-list-link--m-separator--after--Background: #292929;
         }
       }
 
@@ -385,22 +405,36 @@ tags-input .autocomplete .suggestion-item em {
 
     .pf-c-nav__link {
       align-items: center;
+      padding-left: var(--pf-c-nav__list-link--PaddingLeft);
 
-      &::after {
-        display: none;
+      @media screen and (min-width: $grid-float-breakpoint) {
+        padding-left: var(--pf-c-nav__list-link--md--PaddingLeft);
       }
     }
   }
 
-  .pf-c-nav__simple-list {
-    .pf-c-nav__link {
-      font-size: 14px;
-      line-height: 25px;
+  .pf-c-nav__simple-list .pf-c-nav__link {
+    font-size: $font-size-base;
+    line-height: 25px;
+
+    // use `::before` so as not to conflict with `.pf-m-separator::after`
+    &.pf-m-current::before {
+      background-color: var(--pf-c-nav__list-link--m-current--after--BackgroundColor);
+      bottom: 0;
+      content: "";
+      display: block;
+      height: var(--pf-c-nav__list-link--after--Height);
+      left: var(--pf-c-nav__list-link--after--Left);
+      position: absolute;
+      width: var(--pf-c-nav__list-link--after--Width);
+    }
 
-      &.pf-m-current {
-        &::after {
-          display: block;
-        }
+    &.pf-m-separator {
+      margin-bottom: 17px;
+
+      &::after {
+        --pf-c-nav__simple-list-link--m-separator--after--Background: #{$color-pf-black};
+        --pf-c-nav__simple-list-link--m-separator--after--Bottom: -9px;
       }
     }
   }
diff --git a/frontend/public/style/_vars.scss b/frontend/public/style/_vars.scss
index 259654ef3e1..a1e908c3803 100644
--- a/frontend/public/style/_vars.scss
+++ b/frontend/public/style/_vars.scss
@@ -22,7 +22,7 @@ $icon-font-path: $consoleWebFontPath + '/';
 // Disable PatternFly 4 reset.
 $pf-global--enable-reset: false;
 // PatternFly 4 font path.
-$pf-global--font-path: '~@patternfly/patternfly-next/assets/fonts';
+$pf-global--font-path: '~@patternfly/patternfly/assets/fonts';
 $popover-max-width: 325px;
 $table-border-color: $color-pf-black-200;
 
diff --git a/frontend/public/tokener.html b/frontend/public/tokener.html
index 6c245df208b..f3ee72870b5 100644
--- a/frontend/public/tokener.html
+++ b/frontend/public/tokener.html
@@ -21,6 +21,10 @@
     <title>OpenShift Dedicated</title>
     <meta name="application-name" content="OpenShift Dedicated">
     [[ end ]]
+    [[ if eq .Branding "azure" ]]
+    <title>Azure Red Hat OpenShift</title>
+    <meta name="application-name" content="Azure Red Hat OpenShift">
+    [[ end ]]
 
     [[ if eq .Branding "okd" ]]
     <link rel="shortcut icon" href="<%= require('./imgs/okd-favicon.png') %>">
diff --git a/frontend/public/ui/ui-actions.js b/frontend/public/ui/ui-actions.js
index b6deb1eeb80..118f8d9cb15 100644
--- a/frontend/public/ui/ui-actions.js
+++ b/frontend/public/ui/ui-actions.js
@@ -1,3 +1,5 @@
+import { Base64 } from 'js-base64';
+
 import store from '../redux';
 import { history } from '../components/utils/router';
 import { ALL_NAMESPACES_KEY, LAST_NAMESPACE_NAME_LOCAL_STORAGE_KEY } from '../const';
@@ -136,7 +138,7 @@ export const UIActions = {
      * and "/" aren't allowed, so base64 but replace illegal chars.
      */
     let encodedName = textEncoder.encode(name);
-    encodedName = window.btoa(String.fromCharCode.apply(String, encodedName));
+    encodedName = Base64.encode(String.fromCharCode.apply(String, encodedName));
     encodedName = encodedName.replace(/=/g, '_').replace(/\//g, '-');
 
     let subprotocols;
diff --git a/frontend/public/vendor.scss b/frontend/public/vendor.scss
index 4390b47d0b4..e0c52e34728 100644
--- a/frontend/public/vendor.scss
+++ b/frontend/public/vendor.scss
@@ -57,9 +57,10 @@
 @import '~patternfly-react-extensions/dist/sass/filter-side-panel';
 @import '~patternfly-react-extensions/dist/sass/properties-side-panel';
 @import '~patternfly-react-extensions/dist/sass/vertical-tabs';
-@import '~@patternfly/patternfly-next/sass-utilities/all';
-@import "~@patternfly/patternfly-next/_variables";
-@import "~@patternfly/patternfly-next/_fonts";
-@import "~@patternfly/patternfly-next/_base";
-@import '~@patternfly/patternfly-next/utilities/Accessibility/accessibility';
-@import '~@patternfly/patternfly-next/utilities/Spacing/spacing';
+@import '~@patternfly/patternfly/sass-utilities/all';
+@import "~@patternfly/patternfly/_variables";
+@import "~@patternfly/patternfly/_fonts";
+@import "~@patternfly/patternfly/_base";
+@import '~@patternfly/patternfly/utilities/Accessibility/accessibility';
+@import '~@patternfly/patternfly/utilities/Spacing/spacing';
+@import '~@patternfly/patternfly/components/Badge/badge';
diff --git a/frontend/yarn.lock b/frontend/yarn.lock
index 9761713a5d2..669e8b52c2a 100644
--- a/frontend/yarn.lock
+++ b/frontend/yarn.lock
@@ -2,7 +2,7 @@
 # yarn lockfile v1
 
 
-"3d-view-controls@^2.2.0":
+"3d-view-controls@^2.2.2":
   version "2.2.2"
   resolved "https://registry.yarnpkg.com/3d-view-controls/-/3d-view-controls-2.2.2.tgz#7173fc197e9e7e4dbc63213438467047dbc84fa2"
   dependencies:
@@ -86,50 +86,100 @@
   version "0.8.2"
   resolved "https://registry.yarnpkg.com/@emotion/utils/-/utils-0.8.2.tgz#576ff7fb1230185b619a75d258cbc98f0867a8dc"
 
-"@patternfly/patternfly-next@^1.0.109":
-  version "1.0.109"
-  resolved "https://registry.yarnpkg.com/@patternfly/patternfly-next/-/patternfly-next-1.0.109.tgz#5c1a8ca29ca48d030324d3d588af9954e2f36cea"
+"@mapbox/geojson-area@0.2.2":
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/@mapbox/geojson-area/-/geojson-area-0.2.2.tgz#18d7814aa36bf23fbbcc379f8e26a22927debf10"
+  dependencies:
+    wgs84 "0.0.0"
+
+"@mapbox/gl-matrix@^0.0.1":
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/@mapbox/gl-matrix/-/gl-matrix-0.0.1.tgz#e5126aab4d64c36b81c7a97d0ae0dddde5773d2b"
+
+"@mapbox/jsonlint-lines-primitives@^2.0.1":
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/@mapbox/jsonlint-lines-primitives/-/jsonlint-lines-primitives-2.0.2.tgz#ce56e539f83552b58d10d672ea4d6fc9adc7b234"
+
+"@mapbox/mapbox-gl-supported@^1.3.1":
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/@mapbox/mapbox-gl-supported/-/mapbox-gl-supported-1.4.0.tgz#36946b22944fe2cfa43cfafd5ef36fdb54a069e4"
+
+"@mapbox/point-geometry@0.1.0", "@mapbox/point-geometry@^0.1.0", "@mapbox/point-geometry@~0.1.0":
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/@mapbox/point-geometry/-/point-geometry-0.1.0.tgz#8a83f9335c7860effa2eeeca254332aa0aeed8f2"
+
+"@mapbox/shelf-pack@^3.1.0":
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/@mapbox/shelf-pack/-/shelf-pack-3.2.0.tgz#df3630ecce8c042817c9a365b88078412963de64"
+
+"@mapbox/tiny-sdf@^1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@mapbox/tiny-sdf/-/tiny-sdf-1.1.0.tgz#b0b8f5c22005e6ddb838f421ffd257c1f74f9a20"
+
+"@mapbox/unitbezier@^0.0.0":
+  version "0.0.0"
+  resolved "https://registry.yarnpkg.com/@mapbox/unitbezier/-/unitbezier-0.0.0.tgz#15651bd553a67b8581fb398810c98ad86a34524e"
+
+"@mapbox/vector-tile@^1.3.1":
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/@mapbox/vector-tile/-/vector-tile-1.3.1.tgz#d3a74c90402d06e89ec66de49ec817ff53409666"
+  dependencies:
+    "@mapbox/point-geometry" "~0.1.0"
 
-"@patternfly/react-core@^1.43.5":
-  version "1.43.5"
-  resolved "https://registry.yarnpkg.com/@patternfly/react-core/-/react-core-1.43.5.tgz#b66e8915785aecde621663b1c719cf965d9d5bd4"
+"@mapbox/whoots-js@^3.0.0":
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/@mapbox/whoots-js/-/whoots-js-3.1.0.tgz#497c67a1cef50d1a2459ba60f315e448d2ad87fe"
+
+"@patternfly/patternfly@1.0.219":
+  version "1.0.219"
+  resolved "https://registry.yarnpkg.com/@patternfly/patternfly/-/patternfly-1.0.219.tgz#3fb57ca7ec88437d78cd84f6e9563979f1081469"
+  integrity sha512-1HWy1T51G5KgqhmDV9FRXlaxHiQqS0e3vqS3EuAqrlszKh2TChMi1u6kxMGtp/m9VuDziuGiue3V/0+U1mKnRQ==
+
+"@patternfly/react-core@2.4.1":
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/@patternfly/react-core/-/react-core-2.4.1.tgz#3f2fedb160ed9451be5126b906bb8ec493146540"
+  integrity sha512-vWhgD9TGtZwiywcpQQqEv4mtpac3BVfLfviebPdGYqAVde9ZhV+ODcnJcgNGWmPRd+LKVlCJSzpIvbpqYPJ1Wg==
   dependencies:
-    "@patternfly/react-icons" "^2.9.5"
-    "@patternfly/react-styles" "^2.3.0"
+    "@patternfly/react-icons" "^3.2.0"
+    "@patternfly/react-styles" "^2.3.6"
+    "@patternfly/react-tokens" "^2.0.6"
     "@tippy.js/react" "^1.1.1"
+    emotion "^9.2.9"
     exenv "^1.2.2"
     focus-trap-react "^4.0.1"
-  optionalDependencies:
-    "@patternfly/react-tokens" "^1.0.0"
+    tippy.js "^3.4.1"
 
-"@patternfly/react-icons@^2.9.5":
-  version "2.9.5"
-  resolved "https://registry.yarnpkg.com/@patternfly/react-icons/-/react-icons-2.9.5.tgz#abccb6b151f965cb1370a1e0210bc650e202ce97"
+"@patternfly/react-icons@^3.2.0":
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/@patternfly/react-icons/-/react-icons-3.2.0.tgz#ad7e121d43d4d2c857a61c89baef81da38716a55"
+  integrity sha512-DBmddOWqfEcMEn5G1gXv3L53aiwjW95U/mIafBS186xf5ZnVOSZpdzSEMT8NjNyj6AXsIZ965iAY8nO4ryR+VQ==
 
-"@patternfly/react-styles@^2.3.0":
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/@patternfly/react-styles/-/react-styles-2.3.0.tgz#e6041a22c8ad11f622e6ca280075aaf482879d7e"
+"@patternfly/react-styles@^2.3.6":
+  version "2.3.6"
+  resolved "https://registry.yarnpkg.com/@patternfly/react-styles/-/react-styles-2.3.6.tgz#8b5712d9c414ebc27d748985106781520a54f215"
+  integrity sha512-IGhq3KE4bSNrjaIq9ELYZGfabavWtzDlD+9q4mWVKjfXd7Fn0814+MK3dGb8GfjES84bDStiwCAcMGRftcssbQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0-beta.48"
     camel-case "^3.0.0"
     css "^2.2.3"
     cssom "^0.3.4"
     cssstyle "^0.3.1"
-    emotion "^9.2.6"
-    emotion-server "^9.2.6"
+    emotion "^9.2.9"
+    emotion-server "^9.2.9"
     fbjs-scripts "^0.8.3"
     fs-extra "^6.0.1"
     jsdom "^11.11.0"
     relative "^3.0.2"
     resolve-from "^4.0.0"
 
-"@patternfly/react-tokens@^1.0.0":
-  version "1.5.2"
-  resolved "https://registry.yarnpkg.com/@patternfly/react-tokens/-/react-tokens-1.5.2.tgz#0b8c84524d018ad92979a07494ce75a8d4304d32"
+"@patternfly/react-tokens@^2.0.6":
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/@patternfly/react-tokens/-/react-tokens-2.0.6.tgz#40f42a1e176541053478e5c462e22f5412bf2356"
+  integrity sha512-nf6/UpOZNF8B0cKlKR00/IoX3pR9C7srAXlQFBbVevdqjSG2RPLUZaCAPr0ZPN3+XH8WLaPJgY2NrYrlgnsoUw==
 
-"@plotly/d3-sankey@^0.5.0":
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/@plotly/d3-sankey/-/d3-sankey-0.5.0.tgz#b22faea742e58251335ee5d9fba248772607800f"
+"@plotly/d3-sankey@^0.5.1":
+  version "0.5.1"
+  resolved "https://registry.yarnpkg.com/@plotly/d3-sankey/-/d3-sankey-0.5.1.tgz#c2862c71374aba4f097a95a3449c7274a15a22de"
   dependencies:
     d3-array "1"
     d3-collection "1"
@@ -614,11 +664,7 @@
     "@webassemblyjs/wast-parser" "1.5.12"
     long "^3.2.0"
 
-"JSV@>= 4.0.x":
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/JSV/-/JSV-4.0.2.tgz#d077f6825571f82132f9dffaed587b4029feff57"
-
-a-big-triangle@^1.0.0:
+a-big-triangle@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/a-big-triangle/-/a-big-triangle-1.0.3.tgz#eefd30b02a8f525e8b1f72bb6bb1b0c16751c794"
   dependencies:
@@ -638,6 +684,10 @@ abbrev@1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
 
+abs-svg-path@^0.1.1, abs-svg-path@~0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/abs-svg-path/-/abs-svg-path-0.1.1.tgz#df601c8e8d2ba10d4a76d625e236a9a39c2723bf"
+
 accepts@~1.3.5:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.5.tgz#eb777df6011723a3b14e8a72c0805c8e86746bd2"
@@ -678,11 +728,11 @@ acorn@^3.0.4:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-3.3.0.tgz#45e37fb39e8da3f25baee3ff5369e2bb5f22017a"
 
-acorn@^4.0.0, acorn@^4.0.4:
+acorn@^4.0.4:
   version "4.0.13"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.13.tgz#105495ae5361d697bd195c825192e1ad7f253787"
 
-acorn@^5.0.0, acorn@^5.1.0, acorn@^5.5.0:
+acorn@^5.0.0, acorn@^5.5.0:
   version "5.5.3"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.5.3.tgz#f473dd47e0277a08e28e9bec5aeeb04751f0b8c9"
 
@@ -857,6 +907,10 @@ ansi-wrap@0.1.0, ansi-wrap@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/ansi-wrap/-/ansi-wrap-0.1.0.tgz#a82250ddb0015e9a27ca82e82ea603bbfa45efaf"
 
+ansicolors@~0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/ansicolors/-/ansicolors-0.2.1.tgz#be089599097b74a5c9c4a84a0cdbcdb62bd87aef"
+
 any-observable@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/any-observable/-/any-observable-0.2.0.tgz#c67870058003579009083f54ac0abafb5c33d242"
@@ -962,12 +1016,20 @@ array-map@~0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/array-map/-/array-map-0.0.0.tgz#88a2bab73d1cf7bcd5c1b118a003f66f665fa662"
 
-array-normalize@^1.1.2:
+array-normalize@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/array-normalize/-/array-normalize-1.1.3.tgz#73fb837f4816ec19151d3c5e8d853a4590ce01bd"
   dependencies:
     array-bounds "^1.0.0"
 
+array-range@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/array-range/-/array-range-1.0.1.tgz#f56e46591843611c6a56f77ef02eda7c50089bfc"
+
+array-rearrange@^2.2.2:
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/array-rearrange/-/array-rearrange-2.2.2.tgz#fa1a2acf8d02e88dd0c9602aa0e06a79158b2283"
+
 array-reduce@~0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/array-reduce/-/array-reduce-0.0.0.tgz#173899d3ffd1c7d9383e4479525dbe278cab5f2b"
@@ -1074,6 +1136,10 @@ atob-lite@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/atob-lite/-/atob-lite-1.0.0.tgz#b88dca6006922b962094f7556826bab31c4a296b"
 
+atob-lite@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/atob-lite/-/atob-lite-2.0.0.tgz#0fef5ad46f1bd7a8502c65727f0367d5ee43d696"
+
 atob@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.1.tgz#ae2d5a729477f289d60dd7f96a6314a22dd6c22a"
@@ -1869,10 +1935,6 @@ barycentric@^1.0.1:
   dependencies:
     robust-linear-solve "^1.0.0"
 
-base64-js@0.0.2:
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-0.0.2.tgz#024f0f72afa25b75f9c0ee73cd4f55ec1bed9784"
-
 base64-js@^1.0.2:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.0.tgz#cab1e6118f051095e58b5281aea8c1cd22bfc0e3"
@@ -1923,7 +1985,7 @@ binary-search-bounds@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/binary-search-bounds/-/binary-search-bounds-1.0.0.tgz#323ca317e3f2a40f4244c7255f5384a5b207bb69"
 
-binary-search-bounds@^2.0.0, binary-search-bounds@^2.0.3:
+binary-search-bounds@^2.0.0, binary-search-bounds@^2.0.3, binary-search-bounds@^2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/binary-search-bounds/-/binary-search-bounds-2.0.4.tgz#eea0e4081da93baa851c7d851a7e636c3d51307f"
 
@@ -1939,6 +2001,12 @@ bit-twiddle@~0.0.1:
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/bit-twiddle/-/bit-twiddle-0.0.2.tgz#c2eaebb952a3b94acc140497e1cdcd2f1a33f58e"
 
+bitmap-sdf@^1.0.0:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/bitmap-sdf/-/bitmap-sdf-1.0.3.tgz#c99913e5729357a6fd350de34158180c013880b2"
+  dependencies:
+    clamp "^1.0.1"
+
 bl@^0.9.4:
   version "0.9.5"
   resolved "https://registry.yarnpkg.com/bl/-/bl-0.9.5.tgz#c06b797af085ea00bc527afc8efcf11de2232054"
@@ -2053,13 +2121,6 @@ bootstrap@~3.4.0:
   version "3.4.0"
   resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-3.4.0.tgz#f8d77540dd3062283d2ae7687e21c1e691961640"
 
-bops@0.0.6:
-  version "0.0.6"
-  resolved "https://registry.yarnpkg.com/bops/-/bops-0.0.6.tgz#082d1d55fa01e60dbdc2ebc2dba37f659554cf3a"
-  dependencies:
-    base64-js "0.0.2"
-    to-utf8 "0.0.1"
-
 boundary-cells@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/boundary-cells/-/boundary-cells-2.0.1.tgz#e905a8d1419cf47cb36be3dbf525db5e24de0042"
@@ -2111,9 +2172,9 @@ breakjs@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/breakjs/-/breakjs-1.0.0.tgz#ec8353a06862eb43962deae09072ee66a4cd8459"
 
-brfs@^1.4.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/brfs/-/brfs-1.5.0.tgz#a3822ed7a65723e056f89ff4b58e8abc63658f03"
+brfs@^1.4.4:
+  version "1.6.1"
+  resolved "https://registry.yarnpkg.com/brfs/-/brfs-1.6.1.tgz#b78ce2336d818e25eea04a0947cba6d4fb8849c3"
   dependencies:
     quote-stream "^1.0.1"
     resolve "^1.1.5"
@@ -2205,6 +2266,23 @@ bser@^2.0.0:
   dependencies:
     node-int64 "^0.4.0"
 
+buble@^0.19.3:
+  version "0.19.6"
+  resolved "https://registry.yarnpkg.com/buble/-/buble-0.19.6.tgz#915909b6bd5b11ee03b1c885ec914a8b974d34d3"
+  dependencies:
+    chalk "^2.4.1"
+    magic-string "^0.25.1"
+    minimist "^1.2.0"
+    os-homedir "^1.0.1"
+    regexpu-core "^4.2.0"
+    vlq "^1.0.0"
+
+bubleify@^1.0.0, bubleify@^1.1.0, bubleify@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/bubleify/-/bubleify-1.2.0.tgz#17a65b6b70160c4d81a06f28fc2a461621415ea9"
+  dependencies:
+    buble "^0.19.3"
+
 buffer-equal@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/buffer-equal/-/buffer-equal-0.0.1.tgz#91bc74b11ea405bc916bc6aa908faafa5b4aac4b"
@@ -2300,15 +2378,6 @@ cacheable-request@^2.1.1:
     normalize-url "2.0.1"
     responselike "1.0.2"
 
-call-matcher@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/call-matcher/-/call-matcher-1.0.1.tgz#5134d077984f712a54dad3cbf62de28dce416ca8"
-  dependencies:
-    core-js "^2.0.0"
-    deep-equal "^1.0.0"
-    espurify "^1.6.0"
-    estraverse "^4.0.0"
-
 caller-path@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/caller-path/-/caller-path-0.1.0.tgz#94085ef63581ecd3daa92444a8fe94e82577751f"
@@ -2366,6 +2435,19 @@ caniuse-db@^1.0.30000529, caniuse-db@^1.0.30000634, caniuse-db@^1.0.30000639:
   version "1.0.30000815"
   resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000815.tgz#0e218fa133d0d071c886aa041b435258cc746891"
 
+canvas-fit@^1.5.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/canvas-fit/-/canvas-fit-1.5.0.tgz#ae13be66ade42f5be0e487e345fce30a5e5b5e5f"
+  dependencies:
+    element-size "^1.1.1"
+
+cardinal@~0.4.2:
+  version "0.4.4"
+  resolved "https://registry.yarnpkg.com/cardinal/-/cardinal-0.4.4.tgz#ca5bb68a5b511b90fe93b9acea49bdee5c32bfe2"
+  dependencies:
+    ansicolors "~0.2.1"
+    redeyed "~0.4.0"
+
 caseless@~0.11.0:
   version "0.11.0"
   resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.11.0.tgz#715b96ea9841593cc33067923f5ec60ebda4f7d7"
@@ -2423,6 +2505,14 @@ chalk@^2.3.0:
     escape-string-regexp "^1.0.5"
     supports-color "^5.3.0"
 
+chalk@^2.4.1:
+  version "2.4.2"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
+  dependencies:
+    ansi-styles "^3.2.1"
+    escape-string-regexp "^1.0.5"
+    supports-color "^5.3.0"
+
 chalk@~0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-0.4.0.tgz#5199a3ddcd0c1efe23bc08c1b027b06176e0c64f"
@@ -2558,7 +2648,7 @@ classnames@2.x:
   version "2.2.5"
   resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.2.5.tgz#fb3801d453467649ef3603c7d61a02bd129bde6d"
 
-classnames@^2.2.0, classnames@^2.2.3, classnames@^2.2.5:
+classnames@^2.2.0, classnames@^2.2.3, classnames@^2.2.5, classnames@^2.2.6:
   version "2.2.6"
   resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.2.6.tgz#43935bffdd291f326dad0a205309b38d00f650ce"
 
@@ -2701,6 +2791,12 @@ collection-visit@^1.0.0:
     map-visit "^1.0.0"
     object-visit "^1.0.0"
 
+color-alpha@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/color-alpha/-/color-alpha-1.0.3.tgz#318e33edb215bd695d51cae4922640a44107e959"
+  dependencies:
+    color-parse "^1.2.0"
+
 color-convert@^1.3.0:
   version "1.9.1"
   resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.1.tgz#c1261107aeb2f294ebffec9ed9ecad529a6097ed"
@@ -2727,20 +2823,28 @@ color-name@^1.1.1:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
 
-color-parse@^1.3.4:
-  version "1.3.5"
-  resolved "https://registry.yarnpkg.com/color-parse/-/color-parse-1.3.5.tgz#4c810f72e808e4f73b63f72acd78da538a515564"
+color-normalize@^1.0.0, color-normalize@^1.0.3, color-normalize@^1.1.0, color-normalize@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/color-normalize/-/color-normalize-1.3.0.tgz#fcf1f822196b863416fc701350dff8d1e8fdebe1"
+  dependencies:
+    clamp "^1.0.1"
+    color-rgba "^2.1.0"
+    dtype "^2.0.0"
+
+color-parse@^1.2.0, color-parse@^1.3.7:
+  version "1.3.7"
+  resolved "https://registry.yarnpkg.com/color-parse/-/color-parse-1.3.7.tgz#34ac4fb0782b992d3614417b60896c4884771b26"
   dependencies:
     color-name "^1.0.0"
     defined "^1.0.0"
     is-plain-obj "^1.1.0"
 
-color-rgba@^1.1.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/color-rgba/-/color-rgba-1.1.1.tgz#eed993a4297880f44a77c2d62b2f6eba78101d78"
+color-rgba@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/color-rgba/-/color-rgba-2.1.0.tgz#d6f91376b745a76506558ec17b3390e721892ee9"
   dependencies:
     clamp "^1.0.1"
-    color-parse "^1.3.4"
+    color-parse "^1.3.7"
     color-space "^1.14.6"
 
 color-space@^1.14.6:
@@ -2863,6 +2967,16 @@ component-emitter@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz#137918d6d78283f7df7a6b7c5a63e140e69425e6"
 
+compute-dims@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/compute-dims/-/compute-dims-1.1.0.tgz#6d5b712929b6c531af3b4d580ed5adacbbd77e0c"
+  dependencies:
+    utils-copy "^1.0.0"
+    validate.io-array "^1.0.6"
+    validate.io-matrix-like "^1.0.2"
+    validate.io-ndarray-like "^1.0.0"
+    validate.io-positive-integer "^1.0.0"
+
 concat-map@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
@@ -2876,12 +2990,6 @@ concat-stream@1.6.2, concat-stream@^1.5.0, concat-stream@^1.5.2, concat-stream@^
     readable-stream "^2.2.2"
     typedarray "^0.0.6"
 
-concat-stream@~1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.2.1.tgz#f35100b6c46378bfba8b6b80f9f0d0ccdf13dc60"
-  dependencies:
-    bops "0.0.6"
-
 console-browserify@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.1.0.tgz#f0241c45730a9fc6323b206dbf38edc741d0bb10"
@@ -2892,6 +3000,14 @@ console-control-strings@^1.0.0, console-control-strings@~1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
 
+const-max-uint32@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/const-max-uint32/-/const-max-uint32-1.0.2.tgz#f009bb6230e678ed874dd2d6a9cd9e3cbfabb676"
+
+const-pinf-float64@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/const-pinf-float64/-/const-pinf-float64-1.0.0.tgz#f6efb0d79f9c0986d3e79f2923abf9b70b63d726"
+
 constants-browserify@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75"
@@ -2916,7 +3032,7 @@ convert-source-map@^0.3.3:
   version "0.3.5"
   resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-0.3.5.tgz#f1d802950af7dd2631a1febe0596550c86ab3190"
 
-convert-source-map@^1.1.1, convert-source-map@^1.4.0, convert-source-map@^1.5.0, convert-source-map@^1.5.1:
+convert-source-map@^1.4.0, convert-source-map@^1.5.0, convert-source-map@^1.5.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.5.1.tgz#b8278097b9bc229365de5c62cf5fcaed8b5599e5"
 
@@ -2957,7 +3073,7 @@ copy-to-clipboard@^3:
   dependencies:
     toggle-selection "^1.0.3"
 
-core-js@2.x, core-js@^2.0.0, core-js@^2.4.1, core-js@^2.5.0:
+core-js@2.x, core-js@^2.4.1, core-js@^2.5.0:
   version "2.5.3"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.3.tgz#8acc38345824f16d8365b7c9b4259168e8ed603e"
 
@@ -3053,7 +3169,7 @@ create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4:
     safe-buffer "^5.0.1"
     sha.js "^2.4.8"
 
-create-react-context@^0.2.1:
+create-react-context@^0.2.1, create-react-context@^0.2.3:
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/create-react-context/-/create-react-context-0.2.3.tgz#9ec140a6914a22ef04b8b09b7771de89567cb6f3"
   dependencies:
@@ -3121,6 +3237,40 @@ css-element-queries@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/css-element-queries/-/css-element-queries-1.0.2.tgz#a32edfee4a5023688ef4d45f402077306d51d44c"
 
+css-font-size-keywords@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/css-font-size-keywords/-/css-font-size-keywords-1.0.0.tgz#854875ace9aca6a8d2ee0d345a44aae9bb6db6cb"
+
+css-font-stretch-keywords@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/css-font-stretch-keywords/-/css-font-stretch-keywords-1.0.1.tgz#50cee9b9ba031fb5c952d4723139f1e107b54b10"
+
+css-font-style-keywords@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/css-font-style-keywords/-/css-font-style-keywords-1.0.1.tgz#5c3532813f63b4a1de954d13cea86ab4333409e4"
+
+css-font-weight-keywords@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/css-font-weight-keywords/-/css-font-weight-keywords-1.0.0.tgz#9bc04671ac85bc724b574ef5d3ac96b0d604fd97"
+
+css-font@^1.0.0, css-font@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/css-font/-/css-font-1.2.0.tgz#e73cbdc11fd87c8e6c928ad7098a9771c8c2b6e3"
+  dependencies:
+    css-font-size-keywords "^1.0.0"
+    css-font-stretch-keywords "^1.0.1"
+    css-font-style-keywords "^1.0.1"
+    css-font-weight-keywords "^1.0.0"
+    css-global-keywords "^1.0.1"
+    css-system-font-keywords "^1.0.0"
+    pick-by-alias "^1.2.0"
+    string-split-by "^1.0.0"
+    unquote "^1.1.0"
+
+css-global-keywords@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/css-global-keywords/-/css-global-keywords-1.0.1.tgz#72a9aea72796d019b1d2a3252de4e5aaa37e4a69"
+
 css-loader@0.28.x:
   version "0.28.11"
   resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-0.28.11.tgz#c3f9864a700be2711bb5a2462b2389b1a392dab7"
@@ -3157,6 +3307,10 @@ css-selector-tokenizer@^0.7.0:
     fastparse "^1.1.1"
     regexpu-core "^1.0.0"
 
+css-system-font-keywords@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/css-system-font-keywords/-/css-system-font-keywords-1.0.0.tgz#85c6f086aba4eb32c571a3086affc434b84823ed"
+
 css-what@2.1:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/css-what/-/css-what-2.1.0.tgz#9467d032c38cfaefb9f2d79501253062f87fa1bd"
@@ -3179,7 +3333,7 @@ css@^2.2.3:
     source-map-resolve "^0.5.2"
     urix "^0.1.0"
 
-csscolorparser@^1.0.2, csscolorparser@~1.0.2:
+csscolorparser@~1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/csscolorparser/-/csscolorparser-1.0.3.tgz#b34f391eea4da8f3e98231e2ccd8df9c041f171b"
 
@@ -3340,6 +3494,12 @@ d3@^3.5.12, d3@~3.5.0, d3@~3.5.17:
   version "3.5.17"
   resolved "https://registry.yarnpkg.com/d3/-/d3-3.5.17.tgz#bc46748004378b21a360c9fc7cf5231790762fb8"
 
+d@1:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/d/-/d-1.0.0.tgz#754bb5bfe55451da69a58b94d45f4c5b0462d58f"
+  dependencies:
+    es5-ext "^0.10.9"
+
 dargs@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/dargs/-/dargs-5.1.0.tgz#ec7ea50c78564cd36c9d5ec18f66329fade27829"
@@ -3437,7 +3597,7 @@ decompress-response@^3.2.0, decompress-response@^3.3.0:
   dependencies:
     mimic-response "^1.0.0"
 
-deep-equal@^1.0.0, deep-equal@^1.0.1, deep-equal@~1.0.1:
+deep-equal@^1.0.1, deep-equal@~1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.0.1.tgz#f5d260292b660e084eff4cdbc9f08ad3247448b5"
 
@@ -3551,10 +3711,19 @@ detect-indent@^4.0.0:
   dependencies:
     repeating "^2.0.0"
 
+detect-kerning@^2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/detect-kerning/-/detect-kerning-2.1.2.tgz#4ecd548e4a5a3fc880fe2a50609312d000fa9fc2"
+
 detect-libc@^1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
 
+diff@^2.2.2:
+  version "2.2.3"
+  resolved "https://registry.yarnpkg.com/diff/-/diff-2.2.3.tgz#60eafd0d28ee906e4e8ff0a52c1229521033bf99"
+  integrity sha1-YOr9DSjukG5Oj/ClLBIpUhAzv5k=
+
 diff@^3.1.0, diff@^3.2.0, diff@^3.3.1, diff@^3.5.0:
   version "3.5.0"
   resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12"
@@ -3668,12 +3837,23 @@ double-bits@^1.1.0, double-bits@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/double-bits/-/double-bits-1.1.1.tgz#58abba45494da4d0fa36b73ad11a286c9184b1c6"
 
+draw-svg-path@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/draw-svg-path/-/draw-svg-path-1.0.0.tgz#6f116d962dd314b99ea534d6f58dd66cdbd69379"
+  dependencies:
+    abs-svg-path "~0.1.1"
+    normalize-svg-path "~0.1.0"
+
 drmonty-datatables-colvis@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/drmonty-datatables-colvis/-/drmonty-datatables-colvis-1.1.2.tgz#96ab9edfb48643cc2edda3f87b88933cdee8127c"
   dependencies:
     jquery ">=1.7.0"
 
+dtype@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/dtype/-/dtype-2.0.0.tgz#cd052323ce061444ecd2e8f5748f69a29be28434"
+
 dup@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/dup/-/dup-1.0.0.tgz#51fc5ac685f8196469df0b905e934b20af5b4029"
@@ -3716,9 +3896,9 @@ duplexify@^3.4.5:
     readable-stream "^2.0.0"
     stream-shift "^1.0.0"
 
-earcut@^2.0.3:
-  version "2.1.3"
-  resolved "https://registry.yarnpkg.com/earcut/-/earcut-2.1.3.tgz#ca579545f351941af7c3d0df49c9f7d34af99b0c"
+earcut@^2.1.1, earcut@^2.1.3:
+  version "2.1.4"
+  resolved "https://registry.yarnpkg.com/earcut/-/earcut-2.1.4.tgz#6b161f89bfe4bb08576b9e8af165e1477d6a1c02"
 
 ecc-jsbn@~0.1.1:
   version "0.1.1"
@@ -3756,6 +3936,10 @@ elegant-spinner@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/elegant-spinner/-/elegant-spinner-1.0.1.tgz#db043521c95d7e303fd8f345bedc3349cfb0729e"
 
+element-size@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/element-size/-/element-size-1.1.1.tgz#64e5f159d97121631845bcbaecaf279c39b5e34e"
+
 elliptic@^6.0.0:
   version "6.4.0"
   resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.4.0.tgz#cac9af8762c85836187003c8dfe193e5e2eae5df"
@@ -3772,15 +3956,17 @@ emojis-list@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389"
 
-emotion-server@^9.2.6:
+emotion-server@^9.2.9:
   version "9.2.12"
   resolved "https://registry.yarnpkg.com/emotion-server/-/emotion-server-9.2.12.tgz#aaaaa04843108943d1ce5a796e0bc40b06a3223e"
+  integrity sha512-Bhjdl7eNoIeiAVa2QPP5d+1nP/31SiO/K1P/qI9cdXCydg91NwGYmteqhhge8u7PF8fLGTEVQfcPwj21815eBw==
   dependencies:
     create-emotion-server "^9.2.12"
 
-emotion@^9.2.6:
+emotion@^9.2.9:
   version "9.2.12"
   resolved "https://registry.yarnpkg.com/emotion/-/emotion-9.2.12.tgz#53925aaa005614e65c6e43db8243c843574d1ea9"
+  integrity sha512-hcx7jppaI8VoXxIWEhxpDW7I+B4kq9RNzQLmsrF6LY8BGKqe2N+gFAQr0EfuFucFlPs2A9HM4+xNj4NeqEWIOQ==
   dependencies:
     babel-plugin-emotion "^9.2.11"
     create-emotion "^9.2.12"
@@ -3910,10 +4096,26 @@ es-to-primitive@^1.1.1:
     is-date-object "^1.0.1"
     is-symbol "^1.0.2"
 
+es5-ext@^0.10.14, es5-ext@^0.10.35, es5-ext@^0.10.9, es5-ext@~0.10.14:
+  version "0.10.47"
+  resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.47.tgz#d24232e1380daad5449a817be19bde9729024a11"
+  dependencies:
+    es6-iterator "~2.0.3"
+    es6-symbol "~3.1.1"
+    next-tick "1"
+
 es6-error@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/es6-error/-/es6-error-4.1.1.tgz#9e3af407459deed47e9a91f9b885a84eb05c561d"
 
+es6-iterator@^2.0.1, es6-iterator@~2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-2.0.3.tgz#a7de889141a05a94b0854403b2d0a0fbfa98f3b7"
+  dependencies:
+    d "1"
+    es5-ext "^0.10.35"
+    es6-symbol "^3.1.1"
+
 es6-promise@^3.0.2:
   version "3.3.1"
   resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-3.3.1.tgz#a08cdde84ccdbf34d027a1451bc91d4bcd28a613"
@@ -3932,6 +4134,22 @@ es6-promisify@^5.0.0:
   dependencies:
     es6-promise "^4.0.3"
 
+es6-symbol@^3.1.1, es6-symbol@~3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.1.tgz#bf00ef4fdab6ba1b46ecb7b629b4c7ed5715cc77"
+  dependencies:
+    d "1"
+    es5-ext "~0.10.14"
+
+es6-weak-map@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/es6-weak-map/-/es6-weak-map-2.0.2.tgz#5e3ab32251ffd1538a1f8e5ffa1357772f92d96f"
+  dependencies:
+    d "1"
+    es5-ext "^0.10.14"
+    es6-iterator "^2.0.1"
+    es6-symbol "^3.1.1"
+
 escape-html@~1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
@@ -4096,7 +4314,7 @@ esprima@^4.0.0, esprima@~4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.0.tgz#4499eddcd1110e0b218bacf2fa7f7f59f55ca804"
 
-esprima@~1.0.2:
+esprima@~1.0.2, esprima@~1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-1.0.4.tgz#9f557e08fc3b4d26ece9dd34f8fbf476b62585ad"
 
@@ -4104,12 +4322,6 @@ esprima@~1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-1.1.1.tgz#5b6f1547f4d102e670e140c509be6771d6aeb549"
 
-espurify@^1.3.0, espurify@^1.6.0:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/espurify/-/espurify-1.7.0.tgz#1c5cf6cbccc32e6f639380bd4f991fab9ba9d226"
-  dependencies:
-    core-js "^2.0.0"
-
 esquery@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.0.0.tgz#cfba8b57d7fba93f17298a8a006a04cda13d80fa"
@@ -4217,6 +4429,10 @@ expand-tilde@^2.0.0, expand-tilde@^2.0.2:
   dependencies:
     homedir-polyfill "^1.0.1"
 
+expect.js@~0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/expect.js/-/expect.js-0.2.0.tgz#1028533d2c1c363f74a6796ff57ec0520ded2be1"
+
 expect@^21.2.1:
   version "21.2.1"
   resolved "https://registry.yarnpkg.com/expect/-/expect-21.2.1.tgz#003ac2ac7005c3c29e73b38a272d4afadd6d1d7b"
@@ -4338,7 +4554,7 @@ extsprintf@^1.2.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
 
-falafel@^2.0.0, falafel@^2.1.0:
+falafel@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/falafel/-/falafel-2.1.0.tgz#96bb17761daba94f46d001738b3cedf3a67fe06c"
   dependencies:
@@ -4363,9 +4579,11 @@ fast-deep-equal@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"
 
-fast-isnumeric@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/fast-isnumeric/-/fast-isnumeric-1.1.1.tgz#57b81c07a3c09cb9ec3bef9c161818992d893643"
+fast-isnumeric@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/fast-isnumeric/-/fast-isnumeric-1.1.2.tgz#e9dad2643b145d9469cf6e659833e824690446b8"
+  dependencies:
+    is-string-blank "^1.0.1"
 
 fast-json-stable-stringify@^2.0.0:
   version "2.0.0"
@@ -4418,10 +4636,6 @@ fd-slicer@~1.0.1:
   dependencies:
     pend "~1.2.0"
 
-feature-filter@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/feature-filter/-/feature-filter-2.2.0.tgz#3cc356015e968c362afbdf7ff1bb744ddf7fc2e0"
-
 figures@^1.7.0:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/figures/-/figures-1.7.0.tgz#cbe1e3affcf1cd44b80cadfed28dc793a9701d2e"
@@ -4557,10 +4771,20 @@ flat-cache@^1.2.1:
     graceful-fs "^4.1.2"
     write "^0.2.1"
 
+flatten-vertex-data@^1.0.0, flatten-vertex-data@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/flatten-vertex-data/-/flatten-vertex-data-1.0.2.tgz#889fd60bea506006ca33955ee1105175fb620219"
+  dependencies:
+    dtype "^2.0.0"
+
 flatten@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/flatten/-/flatten-1.0.2.tgz#dae46a9d78fbe25292258cc1e780a41d95c03782"
 
+flip-pixels@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/flip-pixels/-/flip-pixels-1.0.2.tgz#aad7b7d9fc65932d5f27e2e4dac4b494140845e4"
+
 flow-parser@^0.*:
   version "0.68.0"
   resolved "https://registry.yarnpkg.com/flow-parser/-/flow-parser-0.68.0.tgz#9cc96620a102e316a314b6bcd56205ceace862d8"
@@ -4585,13 +4809,19 @@ focus-trap@^3.0.0:
     tabbable "^3.1.0"
     xtend "^4.0.1"
 
-font-atlas-sdf@^1.3.2, font-atlas-sdf@^1.3.3:
+font-atlas-sdf@^1.3.3:
   version "1.3.3"
   resolved "https://registry.yarnpkg.com/font-atlas-sdf/-/font-atlas-sdf-1.3.3.tgz#8323f136c69d73a235aa8c6ada640e58f180b8c0"
   dependencies:
     optical-properties "^1.0.0"
     tiny-sdf "^1.0.2"
 
+font-atlas@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/font-atlas/-/font-atlas-2.1.0.tgz#aa2d6dcf656a6c871d66abbd3dfbea2f77178348"
+  dependencies:
+    css-font "^1.0.0"
+
 font-awesome-sass@^4.7.0:
   version "4.7.0"
   resolved "https://registry.yarnpkg.com/font-awesome-sass/-/font-awesome-sass-4.7.0.tgz#4eda693e915009ce00b228e0964dc5eca9bc34e1"
@@ -4600,6 +4830,12 @@ font-awesome@4.7.x, font-awesome@^4.7.0:
   version "4.7.0"
   resolved "https://registry.yarnpkg.com/font-awesome/-/font-awesome-4.7.0.tgz#8fa8cf0411a1a31afd07b06d2902bb9fc815a133"
 
+font-measure@^1.2.2:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/font-measure/-/font-measure-1.2.2.tgz#41dbdac5d230dbf4db08865f54da28a475e83026"
+  dependencies:
+    css-font "^1.2.0"
+
 for-each@~0.3.2:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/for-each/-/for-each-0.3.2.tgz#2c40450b9348e97f281322593ba96704b9abd4d4"
@@ -4814,23 +5050,18 @@ generate-object-property@^1.1.0:
   dependencies:
     is-property "^1.0.0"
 
-geojson-area@0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/geojson-area/-/geojson-area-0.1.0.tgz#d48d807082cfadf4a78df1349be50f38bf1894ae"
-  dependencies:
-    wgs84 "0.0.0"
-
-geojson-rewind@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/geojson-rewind/-/geojson-rewind-0.1.0.tgz#57022a054b196660d755354fe5d26684d90cd019"
+geojson-rewind@^0.3.0:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/geojson-rewind/-/geojson-rewind-0.3.1.tgz#22240797c847cc2f0c1d313e4aa0c915afa7f29d"
   dependencies:
-    concat-stream "~1.2.1"
-    geojson-area "0.1.0"
-    minimist "0.0.5"
+    "@mapbox/geojson-area" "0.2.2"
+    concat-stream "~1.6.0"
+    minimist "1.2.0"
+    sharkdown "^0.1.0"
 
-geojson-vt@^2.4.0:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/geojson-vt/-/geojson-vt-2.4.0.tgz#3c1cf44493f35eb4d2c70c95da6550de66072c05"
+geojson-vt@^3.1.0:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/geojson-vt/-/geojson-vt-3.2.1.tgz#f8adb614d2c1d3f6ee7c4265cad4bbf3ad60c8b7"
 
 get-caller-file@^1.0.1:
   version "1.0.2"
@@ -4865,29 +5096,34 @@ gh-got@^6.0.0:
     got "^7.0.0"
     is-plain-obj "^1.1.0"
 
+gitdiff-parser@^0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/gitdiff-parser/-/gitdiff-parser-0.1.2.tgz#26a256e05e9c2d5016b512a96c1dacb40862b92a"
+  integrity sha512-glDM6E1AwLYYTOPyI0CqamNEUSuwwAkmwULWpE2sHMpMZNzGJwErt7+eV+yIZcsbDza0pVSlwlBHFWbTf2Wu7A==
+
 github-username@^4.0.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/github-username/-/github-username-4.1.0.tgz#cbe280041883206da4212ae9e4b5f169c30bf417"
   dependencies:
     gh-got "^6.0.0"
 
-gl-axes3d@^1.2.5:
-  version "1.2.7"
-  resolved "https://registry.yarnpkg.com/gl-axes3d/-/gl-axes3d-1.2.7.tgz#c0e491c28993060662fab286deb45ae5b67c9442"
+gl-axes3d@^1.4.4:
+  version "1.4.4"
+  resolved "https://registry.yarnpkg.com/gl-axes3d/-/gl-axes3d-1.4.4.tgz#741ac7c6875048c31372461e144435cc12c2dc7e"
   dependencies:
-    bit-twiddle "^1.0.0"
+    bit-twiddle "^1.0.2"
     dup "^1.0.0"
     extract-frustum-planes "^1.0.0"
-    gl-buffer "^2.0.3"
-    gl-mat4 "^1.0.1"
-    gl-shader "^4.0.4"
+    gl-buffer "^2.1.2"
+    gl-mat4 "^1.2.0"
+    gl-shader "^4.2.1"
     gl-state "^1.0.0"
-    gl-vao "^1.1.1"
+    gl-vao "^1.3.0"
     gl-vec4 "^1.0.1"
-    glslify "^6.1.0"
+    glslify "^7.0.0"
     robust-orientation "^1.1.3"
     split-polygon "^1.0.0"
-    vectorize-text "^3.0.0"
+    vectorize-text "^3.2.1"
 
 gl-buffer@^2.0.3, gl-buffer@^2.0.6, gl-buffer@^2.0.8, gl-buffer@^2.1.1, gl-buffer@^2.1.2:
   version "2.1.2"
@@ -4897,43 +5133,45 @@ gl-buffer@^2.0.3, gl-buffer@^2.0.6, gl-buffer@^2.0.8, gl-buffer@^2.1.1, gl-buffe
     ndarray-ops "^1.1.0"
     typedarray-pool "^1.0.0"
 
+gl-cone3d@^1.2.2:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/gl-cone3d/-/gl-cone3d-1.2.2.tgz#f0b2bbcf478924453e4c1310f07a3cde3b61c50b"
+  dependencies:
+    gl-shader "^4.2.1"
+    gl-vec3 "^1.1.3"
+    glsl-inverse "^1.0.0"
+    glsl-out-of-range "^1.0.4"
+    glslify "^7.0.0"
+
 gl-constants@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/gl-constants/-/gl-constants-1.0.0.tgz#597a504e364750ff50253aa35f8dea7af4a5d233"
 
-gl-contour2d@^1.1.2:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/gl-contour2d/-/gl-contour2d-1.1.4.tgz#0d4fc9b59de4ae3e045218d3f67c7a33f9c93428"
+gl-contour2d@^1.1.5:
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/gl-contour2d/-/gl-contour2d-1.1.5.tgz#77d02f04500d969fd7f61e29b00f01f211963a11"
   dependencies:
     binary-search-bounds "^2.0.0"
     cdt2d "^1.0.0"
     clean-pslg "^1.1.0"
     gl-buffer "^2.1.2"
     gl-shader "^4.0.5"
-    glslify "^6.1.0"
+    glslify "^7.0.0"
     iota-array "^1.0.0"
     ndarray "^1.0.18"
     surface-nets "^1.0.2"
 
-gl-error2d@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/gl-error2d/-/gl-error2d-1.2.1.tgz#cc6977f6476f205db3c4eac5b8c48899e48dfdd1"
-  dependencies:
-    gl-buffer "^2.1.2"
-    gl-shader "^4.0.5"
-    glslify "^2.3.1"
-    typedarray-pool "^1.1.0"
-
-gl-error3d@^1.0.6:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/gl-error3d/-/gl-error3d-1.0.7.tgz#67d3e5a6c96e7873f42e5efafd8afabb99158872"
+gl-error3d@^1.0.13:
+  version "1.0.13"
+  resolved "https://registry.yarnpkg.com/gl-error3d/-/gl-error3d-1.0.13.tgz#ba93c235b15d75dc3d92bdc9c2d60aa9efac6c05"
   dependencies:
     gl-buffer "^2.1.2"
     gl-shader "^4.2.1"
     gl-vao "^1.3.0"
-    glslify "^6.0.2"
+    glsl-out-of-range "^1.0.4"
+    glslify "^7.0.0"
 
-gl-fbo@^2.0.3:
+gl-fbo@^2.0.3, gl-fbo@^2.0.5:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/gl-fbo/-/gl-fbo-2.0.5.tgz#0fa75a497cf787695530691c8f04abb6fb55fa22"
   dependencies:
@@ -4948,40 +5186,29 @@ gl-format-compiler-error@^1.0.2:
     glsl-shader-name "^1.0.0"
     sprintf-js "^1.0.3"
 
-gl-heatmap2d@^1.0.3:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/gl-heatmap2d/-/gl-heatmap2d-1.0.4.tgz#0a11cc113dbb9744004f5d265e7d8c1935ebab15"
+gl-heatmap2d@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/gl-heatmap2d/-/gl-heatmap2d-1.0.5.tgz#90364ea643fe48bd555ce84143df076344dbb398"
   dependencies:
     binary-search-bounds "^2.0.3"
     gl-buffer "^2.1.2"
     gl-shader "^4.0.5"
-    glslify "^6.1.0"
+    glslify "^7.0.0"
     iota-array "^1.0.0"
     typedarray-pool "^1.1.0"
 
-gl-line2d@^1.4.1:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/gl-line2d/-/gl-line2d-1.4.1.tgz#bf81794738f9a7637dcdde9668666a44c12a1110"
-  dependencies:
-    gl-buffer "^2.1.2"
-    gl-shader "^4.0.5"
-    gl-texture2d "^2.0.9"
-    glslify "^2.1.2"
-    ndarray "^1.0.18"
-    snap-points-2d "^1.0.1"
-    typedarray-pool "^1.1.0"
-
-gl-line3d@^1.1.0:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/gl-line3d/-/gl-line3d-1.1.2.tgz#873b0d0588feb23b19bf0bb4f6c6beb4e39e0b8a"
+gl-line3d@^1.1.10:
+  version "1.1.10"
+  resolved "https://registry.yarnpkg.com/gl-line3d/-/gl-line3d-1.1.10.tgz#fd77a831aa949de5159dbc1bcf5af0316781ea4f"
   dependencies:
-    binary-search-bounds "^1.0.0"
+    binary-search-bounds "^2.0.4"
     gl-buffer "^2.0.8"
     gl-shader "^4.2.1"
     gl-texture2d "^2.0.2"
     gl-vao "^1.1.3"
+    glsl-out-of-range "^1.0.4"
     glsl-read-float "^1.0.0"
-    glslify "^6.1.0"
+    glslify "^7.0.0"
     ndarray "^1.0.16"
 
 gl-mat2@^1.0.0:
@@ -4996,6 +5223,10 @@ gl-mat4@^1.0.0, gl-mat4@^1.0.1, gl-mat4@^1.0.2, gl-mat4@^1.0.3, gl-mat4@^1.1.2:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/gl-mat4/-/gl-mat4-1.1.4.tgz#1e895b55892e56a896867abd837d38f37a178086"
 
+gl-mat4@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/gl-mat4/-/gl-mat4-1.2.0.tgz#49d8a7636b70aa00819216635f4a3fd3f4669b26"
+
 gl-matrix-invert@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/gl-matrix-invert/-/gl-matrix-invert-1.0.0.tgz#a36d7bde3654c4590a127ee7c68f6e13fea8c63d"
@@ -5004,13 +5235,9 @@ gl-matrix-invert@^1.0.0:
     gl-mat3 "^1.0.0"
     gl-mat4 "^1.0.0"
 
-gl-matrix@^2.3.1:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/gl-matrix/-/gl-matrix-2.4.0.tgz#2089b13301a29eec822d9d99dffc1f78ee9a3c50"
-
-gl-mesh3d@^1.3.0:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/gl-mesh3d/-/gl-mesh3d-1.3.2.tgz#1436104ad86a82c3d25f030ec0cf682db41ebdc2"
+gl-mesh3d@^2.0.7:
+  version "2.0.7"
+  resolved "https://registry.yarnpkg.com/gl-mesh3d/-/gl-mesh3d-2.0.7.tgz#db8faddd0197af04990d722a2bbe64e88118c543"
   dependencies:
     barycentric "^1.0.1"
     colormap "^2.1.0"
@@ -5019,50 +5246,51 @@ gl-mesh3d@^1.3.0:
     gl-shader "^4.2.1"
     gl-texture2d "^2.0.8"
     gl-vao "^1.1.3"
+    glsl-out-of-range "^1.0.4"
     glsl-specular-cook-torrance "^2.0.1"
-    glslify "^6.1.0"
+    glslify "^7.0.0"
     ndarray "^1.0.15"
     normals "^1.0.1"
     polytope-closest-point "^1.0.0"
     simplicial-complex-contour "^1.0.0"
     typedarray-pool "^1.1.0"
 
-gl-plot2d@^1.2.0:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/gl-plot2d/-/gl-plot2d-1.3.1.tgz#93a09daaeabdb24127a38309ff4a2ca67191f48d"
+gl-plot2d@^1.4.2:
+  version "1.4.2"
+  resolved "https://registry.yarnpkg.com/gl-plot2d/-/gl-plot2d-1.4.2.tgz#9da4ec97c489d6885deb835842da7888c1a2dff9"
   dependencies:
-    binary-search-bounds "^2.0.3"
+    binary-search-bounds "^2.0.4"
     gl-buffer "^2.1.2"
-    gl-select-static "^2.0.2"
+    gl-select-static "^2.0.4"
     gl-shader "^4.2.1"
     glsl-inverse "^1.0.0"
-    glslify "^6.1.0"
-    text-cache "^4.1.0"
+    glslify "^7.0.0"
+    text-cache "^4.2.1"
 
-gl-plot3d@^1.5.4:
-  version "1.5.5"
-  resolved "https://registry.yarnpkg.com/gl-plot3d/-/gl-plot3d-1.5.5.tgz#a797bf4b9de0724181da73398b5332b67c731883"
-  dependencies:
-    "3d-view-controls" "^2.2.0"
-    a-big-triangle "^1.0.0"
-    gl-axes3d "^1.2.5"
-    gl-fbo "^2.0.3"
-    gl-mat4 "^1.1.2"
-    gl-select-static "^2.0.2"
+gl-plot3d@^1.6.3:
+  version "1.6.3"
+  resolved "https://registry.yarnpkg.com/gl-plot3d/-/gl-plot3d-1.6.3.tgz#17e1420fa6da178d447f9ef5a82be34b86cb60d7"
+  dependencies:
+    "3d-view-controls" "^2.2.2"
+    a-big-triangle "^1.0.3"
+    gl-axes3d "^1.4.4"
+    gl-fbo "^2.0.5"
+    gl-mat4 "^1.2.0"
+    gl-select-static "^2.0.4"
     gl-shader "^4.2.1"
-    gl-spikes3d "^1.0.3"
-    glslify "^6.1.0"
-    is-mobile "^0.2.2"
-    mouse-change "^1.1.1"
-    ndarray "^1.0.16"
+    gl-spikes3d "^1.0.8"
+    glslify "^7.0.0"
+    is-mobile "^2.0.0"
+    mouse-change "^1.4.0"
+    ndarray "^1.0.18"
 
-gl-pointcloud2d@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/gl-pointcloud2d/-/gl-pointcloud2d-1.0.1.tgz#c87e55164346787af9e8a44459054ae52091546f"
+gl-pointcloud2d@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/gl-pointcloud2d/-/gl-pointcloud2d-1.0.2.tgz#4cd692bf5a021759bdea5878e94a0f9683a8a431"
   dependencies:
     gl-buffer "^2.1.2"
     gl-shader "^4.2.1"
-    glslify "^6.1.0"
+    glslify "^7.0.0"
     typedarray-pool "^1.1.0"
 
 gl-quat@^1.0.0:
@@ -5073,57 +5301,31 @@ gl-quat@^1.0.0:
     gl-vec3 "^1.0.3"
     gl-vec4 "^1.0.0"
 
-gl-scatter2d-sdf@^1.3.11:
-  version "1.3.11"
-  resolved "https://registry.yarnpkg.com/gl-scatter2d-sdf/-/gl-scatter2d-sdf-1.3.11.tgz#aa760905d3cb3c42f4a98a78f830cb3b52bda0f4"
-  dependencies:
-    binary-search-bounds "^2.0.3"
-    clamp "^1.0.1"
-    color-id "^1.1.0"
-    font-atlas-sdf "^1.3.2"
-    gl-buffer "^2.1.2"
-    gl-shader "^4.2.1"
-    gl-texture2d "^2.1.0"
-    glslify "^2.3.1"
-    snap-points-2d "^3.1.0"
-    typedarray-pool "^1.1.0"
-
-gl-scatter2d@^1.3.2:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/gl-scatter2d/-/gl-scatter2d-1.3.2.tgz#27f12ffa7b4303f4215f2209a573d728f1804371"
-  dependencies:
-    array-bounds "^1.0.0"
-    array-normalize "^1.1.2"
-    binary-search-bounds "^2.0.3"
-    gl-buffer "^2.1.2"
-    gl-shader "^4.0.4"
-    glslify "^2.1.2"
-    snap-points-2d "^3.0.0"
-    typedarray-pool "^1.1.0"
-
-gl-scatter3d@^1.0.4:
-  version "1.0.11"
-  resolved "https://registry.yarnpkg.com/gl-scatter3d/-/gl-scatter3d-1.0.11.tgz#ac1e1d043381961558d414629ac9cb42c146e4c4"
+gl-scatter3d@^1.1.6:
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/gl-scatter3d/-/gl-scatter3d-1.1.6.tgz#6b9440b60de754cab06b583789bd1ee6d72e99f2"
   dependencies:
     gl-buffer "^2.0.6"
     gl-mat4 "^1.0.0"
     gl-shader "^4.2.0"
     gl-vao "^1.1.2"
-    glslify "^6.1.0"
+    glsl-out-of-range "^1.0.4"
+    glslify "^7.0.0"
+    is-string-blank "^1.0.1"
     typedarray-pool "^1.0.2"
-    vectorize-text "^3.0.0"
+    vectorize-text "^3.2.1"
 
-gl-select-box@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/gl-select-box/-/gl-select-box-1.0.2.tgz#0c712387eda7a49e8a0934f32a427a3c8ea6dfdb"
+gl-select-box@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/gl-select-box/-/gl-select-box-1.0.3.tgz#8c47ac6f18fa583aa32d9dfe023ac1d588fd9d67"
   dependencies:
     gl-buffer "^2.1.2"
     gl-shader "^4.0.5"
-    glslify "^6.1.0"
+    glslify "^7.0.0"
 
-gl-select-static@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/gl-select-static/-/gl-select-static-2.0.2.tgz#f3e1901df03181d532e795853230679d4af57ee9"
+gl-select-static@^2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/gl-select-static/-/gl-select-static-2.0.4.tgz#c6a12ca956f898bf2f8b9eece57c89bdc1bce6a4"
   dependencies:
     bit-twiddle "^1.0.2"
     cwise "^1.0.3"
@@ -5131,32 +5333,32 @@ gl-select-static@^2.0.2:
     ndarray "^1.0.15"
     typedarray-pool "^1.1.0"
 
-gl-shader@4.2.0, gl-shader@^4.0.5:
+gl-shader@^4.0.5:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/gl-shader/-/gl-shader-4.2.0.tgz#28f77813effa0dd5cda9dab1f301d1b1cda3e87e"
   dependencies:
     gl-format-compiler-error "^1.0.2"
     weakmap-shim "^1.1.0"
 
-gl-shader@^4.0.4, gl-shader@^4.2.0, gl-shader@^4.2.1:
+gl-shader@^4.2.0, gl-shader@^4.2.1:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/gl-shader/-/gl-shader-4.2.1.tgz#bc9b808e9293c51b668e88de615b0c113708dc2f"
   dependencies:
     gl-format-compiler-error "^1.0.2"
     weakmap-shim "^1.1.0"
 
-gl-spikes2d@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/gl-spikes2d/-/gl-spikes2d-1.0.1.tgz#cacdb2d3dbcd202b853452e8500a8b077949cc03"
+gl-spikes2d@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/gl-spikes2d/-/gl-spikes2d-1.0.2.tgz#ef8dbcff6c7451dec2b751d7a3c593d09ad5457f"
 
-gl-spikes3d@^1.0.3:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/gl-spikes3d/-/gl-spikes3d-1.0.6.tgz#6cf748730fb6759d566a6b6c1e32c2fd17f62ef0"
+gl-spikes3d@^1.0.8:
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/gl-spikes3d/-/gl-spikes3d-1.0.8.tgz#4a7ce6659a5404a444d51071d17acbeacf927445"
   dependencies:
     gl-buffer "^2.1.2"
-    gl-shader "^4.0.4"
-    gl-vao "^1.2.1"
-    glslify "^6.1.0"
+    gl-shader "^4.2.1"
+    gl-vao "^1.3.0"
+    glslify "^7.0.0"
 
 gl-state@^1.0.0:
   version "1.0.0"
@@ -5164,11 +5366,20 @@ gl-state@^1.0.0:
   dependencies:
     uniq "^1.0.0"
 
-gl-surface3d@^1.3.0:
-  version "1.3.4"
-  resolved "https://registry.yarnpkg.com/gl-surface3d/-/gl-surface3d-1.3.4.tgz#778f3d8f7598589997e17300d71d1da4eaf93529"
+gl-streamtube3d@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/gl-streamtube3d/-/gl-streamtube3d-1.1.2.tgz#f47562f48a56339624d31430155d45a897a1bd0a"
   dependencies:
-    binary-search-bounds "^1.0.0"
+    gl-vec3 "^1.0.0"
+    glsl-inverse "^1.0.0"
+    glsl-out-of-range "^1.0.4"
+    glslify "^7.0.0"
+
+gl-surface3d@^1.4.1:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/gl-surface3d/-/gl-surface3d-1.4.1.tgz#cdb4e661b3c6a5ccecacc00e0a0185ff6863aaf4"
+  dependencies:
+    binary-search-bounds "^2.0.4"
     bit-twiddle "^1.0.2"
     colormap "^2.1.0"
     dup "^1.0.0"
@@ -5177,8 +5388,9 @@ gl-surface3d@^1.3.0:
     gl-shader "^4.2.0"
     gl-texture2d "^2.0.0"
     gl-vao "^1.1.1"
+    glsl-out-of-range "^1.0.4"
     glsl-specular-beckmann "^1.1.2"
-    glslify "^6.1.0"
+    glslify "^7.0.0"
     ndarray "^1.0.16"
     ndarray-gradient "^1.0.0"
     ndarray-ops "^1.2.1"
@@ -5187,7 +5399,29 @@ gl-surface3d@^1.3.0:
     surface-nets "^1.0.2"
     typedarray-pool "^1.0.0"
 
-gl-texture2d@^2.0.0, gl-texture2d@^2.0.2, gl-texture2d@^2.0.8, gl-texture2d@^2.0.9, gl-texture2d@^2.1.0:
+gl-text@^1.1.6:
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/gl-text/-/gl-text-1.1.6.tgz#1c9aa1e8dbbb9b63067b23a1359bc56ad63922ab"
+  dependencies:
+    bit-twiddle "^1.0.2"
+    color-normalize "^1.1.0"
+    css-font "^1.2.0"
+    detect-kerning "^2.1.2"
+    es6-weak-map "^2.0.2"
+    flatten-vertex-data "^1.0.2"
+    font-atlas "^2.1.0"
+    font-measure "^1.2.2"
+    gl-util "^3.0.7"
+    is-plain-obj "^1.1.0"
+    object-assign "^4.1.1"
+    parse-rect "^1.2.0"
+    parse-unit "^1.0.1"
+    pick-by-alias "^1.2.0"
+    regl "^1.3.6"
+    to-px "^1.0.1"
+    typedarray-pool "^1.1.0"
+
+gl-texture2d@^2.0.0, gl-texture2d@^2.0.2, gl-texture2d@^2.0.8:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/gl-texture2d/-/gl-texture2d-2.1.0.tgz#ff6824e7e7c31a8ba6fdcdbe9e5c695d7e2187c7"
   dependencies:
@@ -5195,10 +5429,26 @@ gl-texture2d@^2.0.0, gl-texture2d@^2.0.2, gl-texture2d@^2.0.8, gl-texture2d@^2.0
     ndarray-ops "^1.2.2"
     typedarray-pool "^1.1.0"
 
-gl-vao@^1.1.1, gl-vao@^1.1.2, gl-vao@^1.1.3, gl-vao@^1.2.0, gl-vao@^1.2.1, gl-vao@^1.3.0:
+gl-util@^3.0.7:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/gl-util/-/gl-util-3.1.1.tgz#998d009d42e7bb85bac25e709d6f90cea0a24eb7"
+  dependencies:
+    is-browser "^2.0.1"
+    is-firefox "^1.0.3"
+    is-plain-obj "^1.1.0"
+    number-is-integer "^1.0.1"
+    object-assign "^4.1.0"
+    pick-by-alias "^1.2.0"
+    weak-map "^1.0.5"
+
+gl-vao@^1.1.1, gl-vao@^1.1.2, gl-vao@^1.1.3, gl-vao@^1.2.0, gl-vao@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/gl-vao/-/gl-vao-1.3.0.tgz#e9e92aa95588cab9d5c2f04b693440c3df691923"
 
+gl-vec3@^1.0.0, gl-vec3@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/gl-vec3/-/gl-vec3-1.1.3.tgz#a47c62f918774a06cbed1b65bcd0288ecbb03826"
+
 gl-vec3@^1.0.2, gl-vec3@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/gl-vec3/-/gl-vec3-1.0.3.tgz#110fd897d0729f6398307381567d0944941bf22b"
@@ -5328,6 +5578,10 @@ glsl-inverse@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/glsl-inverse/-/glsl-inverse-1.0.0.tgz#12c0b1d065f558444d1e6feaf79b5ddf8a918ae6"
 
+glsl-out-of-range@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/glsl-out-of-range/-/glsl-out-of-range-1.0.4.tgz#3d73d083bc9ecc73efd45dfc7063c29e92c9c873"
+
 glsl-read-float@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/glsl-read-float/-/glsl-read-float-1.1.0.tgz#dfb088b0162dcfcc56fc4eddd2f86e18cac32f26"
@@ -5451,7 +5705,7 @@ glslify-loader@1.x:
   dependencies:
     glslify "^2.1.1"
 
-glslify@^2.1.1, glslify@^2.1.2, glslify@^2.3.1:
+glslify@^2.1.1:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/glslify/-/glslify-2.3.1.tgz#47a8ce5bf08609556aa7ec76c6a7d3430776dd46"
   dependencies:
@@ -5465,14 +5719,14 @@ glslify@^2.1.1, glslify@^2.1.2, glslify@^2.3.1:
     through2 "^0.6.3"
     xtend "^4.0.0"
 
-glslify@^6.0.2, glslify@^6.1.0:
-  version "6.1.1"
-  resolved "https://registry.yarnpkg.com/glslify/-/glslify-6.1.1.tgz#f5ee3e79f314bbdb8ededb7a27830db3f2df7e40"
+glslify@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/glslify/-/glslify-7.0.0.tgz#10d5db9541ee07c6548ea55c679edda20307653d"
   dependencies:
     bl "^1.0.0"
     concat-stream "^1.5.2"
     duplexify "^3.4.5"
-    falafel "^2.0.0"
+    falafel "^2.1.0"
     from2 "^2.3.0"
     glsl-resolve "0.0.1"
     glsl-token-whitespace-trim "^1.0.0"
@@ -5482,7 +5736,6 @@ glslify@^6.0.2, glslify@^6.1.0:
     resolve "^1.1.5"
     stack-trace "0.0.9"
     static-eval "^2.0.0"
-    tape "^4.6.0"
     through2 "^2.0.1"
     xtend "^4.0.0"
 
@@ -5535,6 +5788,15 @@ graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6:
   version "4.1.11"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
 
+gray-matter@^3.0.8:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/gray-matter/-/gray-matter-3.1.1.tgz#101f80d9e69eeca6765cdce437705b18f40876ac"
+  dependencies:
+    extend-shallow "^2.0.1"
+    js-yaml "^3.10.0"
+    kind-of "^5.0.2"
+    strip-bom-string "^1.0.0"
+
 grid-index@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/grid-index/-/grid-index-1.0.0.tgz#ad2c5d54ce5b35437faff1d70a9aeb3d1d261110"
@@ -5626,6 +5888,12 @@ has-flag@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
 
+has-hover@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/has-hover/-/has-hover-1.0.1.tgz#3d97437aeb199c62b8ac08acbdc53d3bc52c17f7"
+  dependencies:
+    is-browser "^2.0.1"
+
 has-passive-events@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/has-passive-events/-/has-passive-events-1.0.0.tgz#75fc3dc6dada182c58f24ebbdc018276d1ea3515"
@@ -5941,6 +6209,14 @@ ignore@^3.3.3:
   version "3.3.7"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.7.tgz#612289bfb3c220e186a58118618d5be8c1bab021"
 
+image-palette@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/image-palette/-/image-palette-2.1.0.tgz#d976525a1df75964ca125d2dba2741e92905547f"
+  dependencies:
+    color-id "^1.1.0"
+    pxls "^2.0.0"
+    quantize "^1.0.2"
+
 immediate@~3.0.5:
   version "3.0.6"
   resolved "https://registry.yarnpkg.com/immediate/-/immediate-3.0.6.tgz#9db1dbd0faf8de6fbe0f5dd5e56bb606280de69b"
@@ -6101,12 +6377,20 @@ is-arrayish@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
 
+is-base64@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/is-base64/-/is-base64-0.1.0.tgz#a6f20610c6ef4863a51cba32bc0222544b932622"
+
 is-binary-path@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-1.0.1.tgz#75f16642b480f187a711c814161fd3a4a7655898"
   dependencies:
     binary-extensions "^1.0.0"
 
+is-blob@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/is-blob/-/is-blob-2.0.1.tgz#7fde57ef8782a154bc0f3bdcaa0ffdccb6c33767"
+
 is-boolean-object@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.0.0.tgz#98f8b28030684219a95f375cfbd88ce3405dff93"
@@ -6115,10 +6399,18 @@ is-browser@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/is-browser/-/is-browser-2.0.1.tgz#8bf0baf799a9c62fd9de5bcee4cf3397c3e7529a"
 
+is-browser@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/is-browser/-/is-browser-2.1.0.tgz#fc084d59a5fced307d6708c59356bad7007371a9"
+
 is-buffer@^1.0.2, is-buffer@^1.1.5:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
 
+is-buffer@^2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.3.tgz#4ecf3fcf749cbd1e472689e109ac66261a25e725"
+
 is-builtin-module@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-builtin-module/-/is-builtin-module-1.0.0.tgz#540572d34f7ac3119f8f76c30cbc1b1e037affbe"
@@ -6199,12 +6491,20 @@ is-extglob@^2.1.0, is-extglob@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
 
-is-finite@^1.0.0:
+is-finite@^1.0.0, is-finite@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-finite/-/is-finite-1.0.2.tgz#cc6677695602be550ef11e8b4aa6305342b6d0aa"
   dependencies:
     number-is-nan "^1.0.0"
 
+is-firefox@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/is-firefox/-/is-firefox-1.0.3.tgz#2a2a1567783a417f6e158323108f3861b0918562"
+
+is-float-array@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-float-array/-/is-float-array-1.0.0.tgz#96d67b1cbadf47ab1e05be208933acd386978a09"
+
 is-fullwidth-code-point@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb"
@@ -6237,9 +6537,13 @@ is-glob@^4.0.0:
   dependencies:
     is-extglob "^2.1.1"
 
-is-mobile@^0.2.2:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/is-mobile/-/is-mobile-0.2.2.tgz#0e2e006d99ed2c2155b761df80f2a3619ae2ad9f"
+is-iexplorer@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-iexplorer/-/is-iexplorer-1.0.0.tgz#1d72bc66d3fe22eaf6170dda8cf10943248cfc76"
+
+is-mobile@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/is-mobile/-/is-mobile-2.0.0.tgz#4d0140e91bb4e26d7e0402ead2f8a79d1551b9d5"
 
 is-my-ip-valid@^1.0.0:
   version "1.0.0"
@@ -6275,6 +6579,10 @@ is-number@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-4.0.0.tgz#0026e37f5454d73e356dfe6564699867c6a7f0ff"
 
+is-obj@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"
+
 is-object@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-object/-/is-object-1.0.1.tgz#8952688c5ec2ffd6b03ecc85e769e02903083470"
@@ -6357,6 +6665,10 @@ is-stream@^1.0.0, is-stream@^1.0.1, is-stream@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
 
+is-string-blank@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-string-blank/-/is-string-blank-1.0.1.tgz#866dca066d41d2894ebdfd2d8fe93e586e583a03"
+
 is-string@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.4.tgz#cc3a9b69857d621e963725a24caeec873b826e64"
@@ -6365,6 +6677,10 @@ is-subset@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/is-subset/-/is-subset-0.1.1.tgz#8a59117d932de1de00f245fcdd39ce43f1e939a6"
 
+is-svg-path@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-svg-path/-/is-svg-path-1.0.2.tgz#77ab590c12b3d20348e5c7a13d0040c87784dda0"
+
 is-svg@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/is-svg/-/is-svg-2.1.0.tgz#cf61090da0d9efbcab8722deba6f032208dbb0e9"
@@ -6823,6 +7139,13 @@ js-yaml@3.x, js-yaml@^3.7.0, js-yaml@^3.9.1:
     argparse "^1.0.7"
     esprima "^4.0.0"
 
+js-yaml@^3.10.0:
+  version "3.12.1"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.12.1.tgz#295c8632a18a23e054cf5c9d3cecafe678167600"
+  dependencies:
+    argparse "^1.0.7"
+    esprima "^4.0.0"
+
 js-yaml@^3.9.0:
   version "3.12.0"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.12.0.tgz#eaed656ec8344f10f527c6bfa1b6e2244de167d1"
@@ -6992,13 +7315,6 @@ jsonify@~0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73"
 
-jsonlint-lines-primitives@~1.6.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/jsonlint-lines-primitives/-/jsonlint-lines-primitives-1.6.0.tgz#bb89f60c8b9b612fd913ddaa236649b840d86611"
-  dependencies:
-    JSV ">= 4.0.x"
-    nomnom ">= 1.5.x"
-
 jsonpointer@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/jsonpointer/-/jsonpointer-4.0.1.tgz#4fd92cb34e0e9db3c89c8622ecf51f9b978c6cb9"
@@ -7058,7 +7374,7 @@ kind-of@^4.0.0:
   dependencies:
     is-buffer "^1.1.5"
 
-kind-of@^5.0.0:
+kind-of@^5.0.0, kind-of@^5.0.2:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d"
 
@@ -7224,14 +7540,6 @@ lodash._basecopy@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz#8da0e6a876cf344c0ad8a54882111dd3c5c7ca36"
 
-lodash._baseisequal@^3.0.0:
-  version "3.0.7"
-  resolved "https://registry.yarnpkg.com/lodash._baseisequal/-/lodash._baseisequal-3.0.7.tgz#d8025f76339d29342767dcc887ce5cb95a5b51f1"
-  dependencies:
-    lodash.isarray "^3.0.0"
-    lodash.istypedarray "^3.0.0"
-    lodash.keys "^3.0.0"
-
 lodash._bindcallback@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz#e531c27644cf8b57a99e17ed95b35c748789392e"
@@ -7287,10 +7595,20 @@ lodash.endswith@^4.2.1:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/lodash.endswith/-/lodash.endswith-4.2.1.tgz#fed59ac1738ed3e236edd7064ec456448b37bc09"
 
+lodash.escape@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/lodash.escape/-/lodash.escape-4.0.1.tgz#c9044690c21e04294beaa517712fded1fa88de98"
+  integrity sha1-yQRGkMIeBClL6qUXcS/e0fqI3pg=
+
 lodash.escaperegexp@^4.1.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/lodash.escaperegexp/-/lodash.escaperegexp-4.1.2.tgz#64762c48618082518ac3df4ccf5d5886dae20347"
 
+lodash.findlastindex@^4.6.0:
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/lodash.findlastindex/-/lodash.findlastindex-4.6.0.tgz#b8375ac0f02e9b926375cdf8dc3ea814abf9c6ac"
+  integrity sha1-uDdawPAum5Jjdc343D6oFKv5xqw=
+
 lodash.flattendeep@^4.4.0:
   version "4.4.0"
   resolved "https://registry.yarnpkg.com/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz#fb030917f86a3134e5bc9bec0d69e0013ddfedb2"
@@ -7303,13 +7621,6 @@ lodash.isarray@^3.0.0:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/lodash.isarray/-/lodash.isarray-3.0.4.tgz#79e4eb88c36a8122af86f844aa9bcd851b5fbb55"
 
-lodash.isequal@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-3.0.4.tgz#1c35eb3b6ef0cd1ff51743e3ea3cf7fdffdacb64"
-  dependencies:
-    lodash._baseisequal "^3.0.0"
-    lodash._bindcallback "^3.0.0"
-
 lodash.isfunction@^3.0.8:
   version "3.0.9"
   resolved "https://registry.yarnpkg.com/lodash.isfunction/-/lodash.isfunction-3.0.9.tgz#06de25df4db327ac931981d1bdb067e5af68d051"
@@ -7322,10 +7633,6 @@ lodash.isstring@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/lodash.isstring/-/lodash.isstring-4.0.1.tgz#d527dfb5456eca7cc9bb95d5daeaf88ba54a5451"
 
-lodash.istypedarray@^3.0.0:
-  version "3.0.6"
-  resolved "https://registry.yarnpkg.com/lodash.istypedarray/-/lodash.istypedarray-3.0.6.tgz#c9a477498607501d8e8494d283b87c39281cef62"
-
 lodash.keys@^3.0.0:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/lodash.keys/-/lodash.keys-3.1.2.tgz#4dbc0472b156be50a0b286855d1bd0b0c656098a"
@@ -7334,6 +7641,11 @@ lodash.keys@^3.0.0:
     lodash.isarguments "^3.0.0"
     lodash.isarray "^3.0.0"
 
+lodash.mapvalues@^4.6.0:
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/lodash.mapvalues/-/lodash.mapvalues-4.6.0.tgz#1bafa5005de9dd6f4f26668c30ca37230cc9689c"
+  integrity sha1-G6+lAF3p3W9PJmaMMMo3IwzJaJw=
+
 lodash.memoize@^4.1.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe"
@@ -7468,6 +7780,12 @@ magic-string@^0.22.4:
   dependencies:
     vlq "^0.2.2"
 
+magic-string@^0.25.1:
+  version "0.25.1"
+  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.1.tgz#b1c248b399cd7485da0fe7385c2fc7011843266e"
+  dependencies:
+    sourcemap-codec "^1.4.1"
+
 make-dir@^1.0.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.3.0.tgz#79c1033b80515bd6d24ec9933e860ca75ee27f0c"
@@ -7514,60 +7832,36 @@ map-visit@^1.0.0:
   dependencies:
     object-visit "^1.0.0"
 
-mapbox-gl-function@^1.2.1:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/mapbox-gl-function/-/mapbox-gl-function-1.3.0.tgz#cee3d95750c189d45e83ab41a0a57fc2a8a509bc"
-
-mapbox-gl-shaders@mapbox/mapbox-gl-shaders#de2ab007455aa2587c552694c68583f94c9f2747:
-  version "1.0.0"
-  resolved "https://codeload.github.com/mapbox/mapbox-gl-shaders/tar.gz/de2ab007455aa2587c552694c68583f94c9f2747"
-  dependencies:
-    brfs "^1.4.0"
-
-mapbox-gl-style-spec@mapbox/mapbox-gl-style-spec#83b1a3e5837d785af582efd5ed1a212f2df6a4ae:
-  version "8.8.0"
-  resolved "https://codeload.github.com/mapbox/mapbox-gl-style-spec/tar.gz/83b1a3e5837d785af582efd5ed1a212f2df6a4ae"
-  dependencies:
+mapbox-gl@0.45.0:
+  version "0.45.0"
+  resolved "https://registry.yarnpkg.com/mapbox-gl/-/mapbox-gl-0.45.0.tgz#af71cc824f0d7e51ccd5c505eaae411bc0910ccd"
+  dependencies:
+    "@mapbox/gl-matrix" "^0.0.1"
+    "@mapbox/jsonlint-lines-primitives" "^2.0.1"
+    "@mapbox/mapbox-gl-supported" "^1.3.1"
+    "@mapbox/point-geometry" "^0.1.0"
+    "@mapbox/shelf-pack" "^3.1.0"
+    "@mapbox/tiny-sdf" "^1.1.0"
+    "@mapbox/unitbezier" "^0.0.0"
+    "@mapbox/vector-tile" "^1.3.1"
+    "@mapbox/whoots-js" "^3.0.0"
+    brfs "^1.4.4"
     csscolorparser "~1.0.2"
-    jsonlint-lines-primitives "~1.6.0"
-    lodash.isequal "^3.0.4"
-    minimist "0.0.8"
-    rw "^0.1.4"
-    sort-object "^0.3.2"
-
-mapbox-gl-supported@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/mapbox-gl-supported/-/mapbox-gl-supported-1.2.0.tgz#cbd34df894206cadda9a33c8d9a4609f26bb1989"
-
-mapbox-gl@^0.22.0:
-  version "0.22.1"
-  resolved "https://registry.yarnpkg.com/mapbox-gl/-/mapbox-gl-0.22.1.tgz#92a965547d4c2f24c22cbc487eeda48694cb627a"
-  dependencies:
-    csscolorparser "^1.0.2"
-    earcut "^2.0.3"
-    feature-filter "^2.2.0"
-    geojson-rewind "^0.1.0"
-    geojson-vt "^2.4.0"
-    gl-matrix "^2.3.1"
+    earcut "^2.1.3"
+    geojson-rewind "^0.3.0"
+    geojson-vt "^3.1.0"
+    gray-matter "^3.0.8"
     grid-index "^1.0.0"
-    mapbox-gl-function "^1.2.1"
-    mapbox-gl-shaders mapbox/mapbox-gl-shaders#de2ab007455aa2587c552694c68583f94c9f2747
-    mapbox-gl-style-spec mapbox/mapbox-gl-style-spec#83b1a3e5837d785af582efd5ed1a212f2df6a4ae
-    mapbox-gl-supported "^1.2.0"
-    pbf "^1.3.2"
-    pngjs "^2.2.0"
-    point-geometry "^0.0.0"
+    minimist "0.0.8"
+    pbf "^3.0.5"
     quickselect "^1.0.0"
-    request "^2.39.0"
-    resolve-url "^0.2.1"
-    shelf-pack "^1.0.0"
-    supercluster "^2.0.1"
-    unassertify "^2.0.0"
-    unitbezier "^0.0.0"
-    vector-tile "^1.3.0"
-    vt-pbf "^2.0.2"
-    webworkify "^1.3.0"
-    whoots-js "^2.0.0"
+    rw "^1.3.3"
+    shuffle-seed "^1.1.6"
+    sort-object "^0.3.2"
+    supercluster "^2.3.0"
+    through2 "^2.0.3"
+    tinyqueue "^1.1.0"
+    vt-pbf "^3.0.1"
 
 marching-simplex-table@^1.0.0:
   version "1.0.0"
@@ -7602,6 +7896,10 @@ math-expression-evaluator@^1.2.14:
   version "1.2.17"
   resolved "https://registry.yarnpkg.com/math-expression-evaluator/-/math-expression-evaluator-1.2.17.tgz#de819fdbcd84dccd8fae59c6aeb79615b9d266ac"
 
+math-log2@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/math-log2/-/math-log2-1.0.1.tgz#fb8941be5f5ebe8979e718e6273b178e58694565"
+
 matrix-camera-controller@^2.1.1, matrix-camera-controller@^2.1.3:
   version "2.1.3"
   resolved "https://registry.yarnpkg.com/matrix-camera-controller/-/matrix-camera-controller-2.1.3.tgz#35e5260cc1cd550962ba799f2d8d4e94b1a39370"
@@ -7795,14 +8093,14 @@ minimist@0.0.8, minimist@~0.0.1:
   version "0.0.8"
   resolved "http://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
 
+minimist@1.2.0, minimist@^1.1.0, minimist@^1.1.1, minimist@^1.1.3, minimist@^1.2.0, minimist@~1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
+
 minimist@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.1.0.tgz#99df657a52574c21c9057497df742790b2b4c0de"
 
-minimist@^1.1.0, minimist@^1.1.1, minimist@^1.1.3, minimist@^1.2.0, minimist@~1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
-
 minimist@~0.0.8:
   version "0.0.10"
   resolved "http://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
@@ -7912,12 +8210,6 @@ ms@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"
 
-multi-stage-sourcemap@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/multi-stage-sourcemap/-/multi-stage-sourcemap-0.2.1.tgz#b09fc8586eaa17f81d575c4ad02e0f7a3f6b1105"
-  dependencies:
-    source-map "^0.1.34"
-
 multimatch@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/multimatch/-/multimatch-2.1.0.tgz#9c7906a22fb4c02919e2f5f75161b4cdbd4b2a2b"
@@ -8075,6 +8367,10 @@ neo-async@^2.5.0:
   version "2.5.1"
   resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.5.1.tgz#acb909e327b1e87ec9ef15f41b8a269512ad41ee"
 
+next-tick@1:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/next-tick/-/next-tick-1.0.0.tgz#ca86d1fe8828169b0120208e3dc8424b9db8342c"
+
 nextafter@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/nextafter/-/nextafter-1.0.0.tgz#b7d77b535310e3e097e6025abb0a903477ec1a3a"
@@ -8216,7 +8512,7 @@ node-sass@4.8.x:
     stdout-stream "^1.4.0"
     "true-case-path" "^1.0.2"
 
-"nomnom@>= 1.5.x", nomnom@^1.8.1:
+nomnom@^1.8.1:
   version "1.8.1"
   resolved "https://registry.yarnpkg.com/nomnom/-/nomnom-1.8.1.tgz#2151f722472ba79e50a76fc125bb8c8f2e4dc2a7"
   dependencies:
@@ -8268,6 +8564,16 @@ normalize-range@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/normalize-range/-/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942"
 
+normalize-svg-path@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/normalize-svg-path/-/normalize-svg-path-1.0.1.tgz#6f729ad6b70bb4ca4eff2fe4b107489efe1d56fe"
+  dependencies:
+    svg-arc-to-cubic-bezier "^3.0.0"
+
+normalize-svg-path@~0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/normalize-svg-path/-/normalize-svg-path-0.1.0.tgz#456360e60ece75fbef7b5d7e160480e7ffd16fe5"
+
 normalize-url@2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-2.0.1.tgz#835a9da1551fa26f70e92329069a23aa6574d7e6"
@@ -8325,6 +8631,12 @@ num2fraction@^1.2.2:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/num2fraction/-/num2fraction-1.2.2.tgz#6f682b6a027a4e9ddfa4564cd2589d1d4e669ede"
 
+number-is-integer@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/number-is-integer/-/number-is-integer-1.0.1.tgz#e59bca172ffed27318e79c7ceb6cb72c095b2152"
+  dependencies:
+    is-finite "^1.0.1"
+
 number-is-nan@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
@@ -8377,7 +8689,7 @@ object-is@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.0.1.tgz#0aa60ec9989a0b3ed795cf4d06f62cf1ad6539b6"
 
-object-keys@^1.0.11, object-keys@^1.0.12:
+object-keys@^1.0.11, object-keys@^1.0.12, object-keys@^1.0.9:
   version "1.0.12"
   resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.0.12.tgz#09c53855377575310cca62f55bb334abff7b3ed2"
 
@@ -8524,7 +8836,7 @@ os-browserify@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27"
 
-os-homedir@^1.0.0:
+os-homedir@^1.0.0, os-homedir@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
 
@@ -8639,6 +8951,10 @@ param-case@2.1.x:
   dependencies:
     no-case "^2.2.0"
 
+parenthesis@^3.1.5:
+  version "3.1.5"
+  resolved "https://registry.yarnpkg.com/parenthesis/-/parenthesis-3.1.5.tgz#077d0738bb6f65d951b9f9b7c438f2aabe965c6e"
+
 parse-asn1@^5.0.0:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.1.tgz#f6bf293818332bd0dab54efb16087724745e6ca8"
@@ -8675,6 +8991,16 @@ parse-passwd@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6"
 
+parse-rect@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/parse-rect/-/parse-rect-1.2.0.tgz#e0a5b0dbaaaee637a0a1eb9779969e19399d8dec"
+  dependencies:
+    pick-by-alias "^1.2.0"
+
+parse-svg-path@^0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/parse-svg-path/-/parse-svg-path-0.1.2.tgz#7a7ec0d1eb06fa5325c7d3e009b859a09b5d49eb"
+
 parse-unit@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/parse-unit/-/parse-unit-1.0.1.tgz#7e1bb6d5bef3874c28e392526a2541170291eecf"
@@ -8776,21 +9102,25 @@ patternfly-bootstrap-treeview@~2.1.0:
     bootstrap "3.3.x"
     jquery ">= 2.1.x"
 
-patternfly-react-extensions@2.14.1:
-  version "2.14.1"
-  resolved "https://registry.yarnpkg.com/patternfly-react-extensions/-/patternfly-react-extensions-2.14.1.tgz#86690c80ed8af055649bf8c3de9087ca69c4a8f3"
+patternfly-react-extensions@2.16.19:
+  version "2.16.19"
+  resolved "https://registry.yarnpkg.com/patternfly-react-extensions/-/patternfly-react-extensions-2.16.19.tgz#233c1e70dbe6b7bb68117830ea056a59672d0677"
+  integrity sha512-Wg7HyZnx/WBbdZtMkdBlsLqAe0HYH8lgpAzvgpD5Cvg/20cVUaOBozU/SMnTjj2IG0DNVwnN8IAR6M/GSmIt/g==
   dependencies:
     breakjs "^1.0.0"
     classnames "^2.2.5"
     css-element-queries "^1.0.1"
     patternfly "^3.58.0"
-    patternfly-react "^2.28.1"
+    patternfly-react "^2.29.17"
     react-bootstrap "^0.32.1"
+    react-diff-view "^1.8.1"
     react-virtualized "9.x"
+    unidiff "^1.0.1"
 
-patternfly-react@^2.28.1:
-  version "2.28.2"
-  resolved "https://registry.yarnpkg.com/patternfly-react/-/patternfly-react-2.28.2.tgz#aca060da08bfe5dae1643ddbe5f2aaa24f4949df"
+patternfly-react@2.29.17, patternfly-react@^2.29.17:
+  version "2.29.17"
+  resolved "https://registry.yarnpkg.com/patternfly-react/-/patternfly-react-2.29.17.tgz#e6d11a8dde35a7c9ba15383c3c6e74b7db10f75e"
+  integrity sha512-/lq9rVYM+wDVXdudPMNluymnPaSrj1djiEpm+MzNdj95unnlkW4SKtr6uND2IWIvSscKWPF+1Dvkjwsi7hZ2Kg==
   dependencies:
     bootstrap-slider-without-jquery "^10.0.0"
     breakjs "^1.0.0"
@@ -8800,32 +9130,7 @@ patternfly-react@^2.28.1:
     patternfly "^3.58.0"
     react-bootstrap "^0.32.1"
     react-bootstrap-switch "^15.5.3"
-    react-bootstrap-typeahead "^3.1.3"
-    react-c3js "^0.1.20"
-    react-click-outside "^3.0.1"
-    react-collapse "^4.0.3"
-    react-fontawesome "^1.6.1"
-    react-motion "^0.5.2"
-    reactabular-table "^8.14.0"
-    recompose "^0.26.0"
-    uuid "^3.3.2"
-  optionalDependencies:
-    sortabular "^1.5.1"
-    table-resolver "^3.2.0"
-
-patternfly-react@^2.29.1:
-  version "2.29.1"
-  resolved "https://registry.yarnpkg.com/patternfly-react/-/patternfly-react-2.29.1.tgz#3def482e4ca48b0c0b0ccad13b32a6eb49d4e9c4"
-  dependencies:
-    bootstrap-slider-without-jquery "^10.0.0"
-    breakjs "^1.0.0"
-    classnames "^2.2.5"
-    css-element-queries "^1.0.1"
-    lodash "^4.17.11"
-    patternfly "^3.58.0"
-    react-bootstrap "^0.32.1"
-    react-bootstrap-switch "^15.5.3"
-    react-bootstrap-typeahead "^3.1.3"
+    react-bootstrap-typeahead "^3.4.1"
     react-c3js "^0.1.20"
     react-click-outside "^3.0.1"
     react-collapse "^4.0.3"
@@ -8900,9 +9205,9 @@ patternfly@^3.59.0:
     patternfly-bootstrap-combobox "~1.1.7"
     patternfly-bootstrap-treeview "~2.1.0"
 
-pbf@^1.3.2:
-  version "1.3.7"
-  resolved "https://registry.yarnpkg.com/pbf/-/pbf-1.3.7.tgz#1e3d047ba3cbe8086ae854a25503ab4537d4335d"
+pbf@^3.0.5:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/pbf/-/pbf-3.1.0.tgz#f70004badcb281761eabb1e76c92f179f08189e9"
   dependencies:
     ieee754 "^1.1.6"
     resolve-protobuf-schema "^2.0.0"
@@ -8942,6 +9247,10 @@ permutation-rank@^1.0.0:
     invert-permutation "^1.0.0"
     typedarray-pool "^1.0.0"
 
+pick-by-alias@^1.1.0, pick-by-alias@^1.1.1, pick-by-alias@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/pick-by-alias/-/pick-by-alias-1.2.0.tgz#5f7cb2b1f21a6e1e884a0c87855aa4a37361107b"
+
 pify@^2.0.0, pify@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
@@ -8991,41 +9300,44 @@ planar-graph-to-polyline@^1.0.0:
     two-product "^1.0.0"
     uniq "^1.0.0"
 
-plotly.js@1.28.x:
-  version "1.28.3"
-  resolved "https://registry.yarnpkg.com/plotly.js/-/plotly.js-1.28.3.tgz#79241d119882e07ee97bf62afe7cc312b5108663"
+plotly.js@1.44.4:
+  version "1.44.4"
+  resolved "https://registry.yarnpkg.com/plotly.js/-/plotly.js-1.44.4.tgz#dcf6ffb27f7586e1e19f0c601fd4f4364a47aba0"
   dependencies:
     "3d-view" "^2.0.0"
-    "@plotly/d3-sankey" "^0.5.0"
+    "@plotly/d3-sankey" "^0.5.1"
     alpha-shape "^1.0.0"
-    color-rgba "^1.1.0"
+    array-range "^1.0.1"
+    canvas-fit "^1.5.0"
+    color-normalize "^1.3.0"
     convex-hull "^1.0.3"
     country-regex "^1.1.0"
     d3 "^3.5.12"
     d3-force "^1.0.6"
     delaunay-triangulate "^1.1.6"
     es6-promise "^3.0.2"
-    fast-isnumeric "^1.1.1"
+    fast-isnumeric "^1.1.2"
     font-atlas-sdf "^1.3.3"
-    gl-contour2d "^1.1.2"
-    gl-error2d "^1.2.1"
-    gl-error3d "^1.0.6"
-    gl-heatmap2d "^1.0.3"
-    gl-line2d "^1.4.1"
-    gl-line3d "^1.1.0"
-    gl-mat4 "^1.1.2"
-    gl-mesh3d "^1.3.0"
-    gl-plot2d "^1.2.0"
-    gl-plot3d "^1.5.4"
-    gl-pointcloud2d "^1.0.0"
-    gl-scatter2d "^1.3.2"
-    gl-scatter2d-sdf "^1.3.11"
-    gl-scatter3d "^1.0.4"
-    gl-select-box "^1.0.1"
-    gl-shader "4.2.0"
-    gl-spikes2d "^1.0.1"
-    gl-surface3d "^1.3.0"
-    mapbox-gl "^0.22.0"
+    gl-cone3d "^1.2.2"
+    gl-contour2d "^1.1.5"
+    gl-error3d "^1.0.13"
+    gl-heatmap2d "^1.0.5"
+    gl-line3d "^1.1.10"
+    gl-mat4 "^1.2.0"
+    gl-mesh3d "^2.0.7"
+    gl-plot2d "^1.4.2"
+    gl-plot3d "^1.6.3"
+    gl-pointcloud2d "^1.0.2"
+    gl-scatter3d "^1.1.6"
+    gl-select-box "^1.0.3"
+    gl-spikes2d "^1.0.2"
+    gl-streamtube3d "^1.1.2"
+    gl-surface3d "^1.4.1"
+    gl-text "^1.1.6"
+    glslify "^7.0.0"
+    has-hover "^1.0.1"
+    has-passive-events "^1.0.0"
+    mapbox-gl "0.45.0"
     matrix-camera-controller "^2.1.3"
     mouse-change "^1.4.0"
     mouse-event-offset "^3.0.2"
@@ -9033,13 +9345,19 @@ plotly.js@1.28.x:
     ndarray "^1.0.18"
     ndarray-fill "^1.0.2"
     ndarray-homography "^1.0.0"
-    ndarray-ops "^1.2.2"
-    regl "^1.3.0"
+    point-cluster "^3.1.4"
+    polybooljs "^1.2.0"
+    regl "^1.3.11"
+    regl-error2d "^2.0.6"
+    regl-line2d "3.0.13"
+    regl-scatter2d "^3.1.3"
+    regl-splom "^1.0.6"
     right-now "^1.0.0"
     robust-orientation "^1.1.3"
     sane-topojson "^2.0.0"
     strongly-connected-components "^1.0.1"
     superscript-text "^1.0.0"
+    svg-path-sdf "^1.1.3"
     tinycolor2 "^1.3.0"
     topojson-client "^2.1.0"
     webgl-context "^2.2.0"
@@ -9063,13 +9381,20 @@ pn@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/pn/-/pn-1.1.0.tgz#e2f4cef0e219f463c179ab37463e4e1ecdccbafb"
 
-pngjs@^2.2.0:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/pngjs/-/pngjs-2.3.1.tgz#11d1e12b9cb64d63e30c143a330f4c1f567da85f"
-
-point-geometry@0.0.0, point-geometry@^0.0.0:
-  version "0.0.0"
-  resolved "https://registry.yarnpkg.com/point-geometry/-/point-geometry-0.0.0.tgz#6fcbcad7a803b6418247dd6e49c2853c584daff7"
+point-cluster@^3.1.4:
+  version "3.1.4"
+  resolved "https://registry.yarnpkg.com/point-cluster/-/point-cluster-3.1.4.tgz#785fe5ca1351e2cf00f8291a5a653113db892f8e"
+  dependencies:
+    array-bounds "^1.0.1"
+    array-normalize "^1.1.3"
+    binary-search-bounds "^2.0.4"
+    bubleify "^1.1.0"
+    clamp "^1.0.1"
+    dtype "^2.0.0"
+    flatten-vertex-data "^1.0.0"
+    is-obj "^1.0.1"
+    math-log2 "^1.0.1"
+    parse-rect "^1.2.0"
 
 point-in-big-polygon@^2.0.0:
   version "2.0.0"
@@ -9080,6 +9405,10 @@ point-in-big-polygon@^2.0.0:
     robust-orientation "^1.1.3"
     slab-decomposition "^1.0.1"
 
+polybooljs@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/polybooljs/-/polybooljs-1.2.0.tgz#b4390c2e079d4c262d3b2504c6288d95ba7a4758"
+
 polytope-closest-point@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/polytope-closest-point/-/polytope-closest-point-1.0.0.tgz#e6e57f4081ab5e8c778b811ef06e2c48ae338c3f"
@@ -9532,6 +9861,17 @@ punycode@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.0.tgz#5f863edc89b96db09074bad7947bf09056ca4e7d"
 
+pxls@^2.0.0:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/pxls/-/pxls-2.3.2.tgz#79100d2cc95089fc6e00053a9d93c1ddddb2c7b4"
+  dependencies:
+    arr-flatten "^1.1.0"
+    compute-dims "^1.1.0"
+    flip-pixels "^1.0.2"
+    is-browser "^2.1.0"
+    is-buffer "^2.0.3"
+    to-uint8 "^1.4.1"
+
 q@1.4.1, q@^1.1.2, q@^1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/q/-/q-1.4.1.tgz#55705bcd93c5f3673530c2c2cbc0c2b3addc286e"
@@ -9552,6 +9892,10 @@ qs@~6.5.1:
   version "6.5.1"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.1.tgz#349cdf6eef89ec45c12d7d5eb3fc0c870343a6d8"
 
+quantize@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/quantize/-/quantize-1.0.2.tgz#d25ac200a77b6d70f40127ca171a10e33c8546de"
+
 quat-slerp@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/quat-slerp/-/quat-slerp-1.0.1.tgz#2baa15ce3a6bbdc3241d972eb17283139ed69f29"
@@ -9606,6 +9950,12 @@ raf@^3.1.0, raf@^3.4.0:
   dependencies:
     performance-now "^2.1.0"
 
+raf@^3.4.1:
+  version "3.4.1"
+  resolved "https://registry.yarnpkg.com/raf/-/raf-3.4.1.tgz#0742e99a4a6552f445d73e3ee0328af0ff1ede39"
+  dependencies:
+    performance-now "^2.1.0"
+
 railroad-diagrams@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/railroad-diagrams/-/railroad-diagrams-1.0.0.tgz#eb7e6267548ddedfb899c1b90e57374559cddb7e"
@@ -9669,17 +10019,18 @@ react-bootstrap-switch@^15.5.3:
   version "15.5.3"
   resolved "https://registry.yarnpkg.com/react-bootstrap-switch/-/react-bootstrap-switch-15.5.3.tgz#97287791d4ec0d1892d142542e7e5248002b1251"
 
-react-bootstrap-typeahead@^3.1.3:
-  version "3.2.3"
-  resolved "https://registry.yarnpkg.com/react-bootstrap-typeahead/-/react-bootstrap-typeahead-3.2.3.tgz#ef93c9afbcc43335c6c77c90e160a3abad95732c"
+react-bootstrap-typeahead@^3.4.1:
+  version "3.4.1"
+  resolved "https://registry.yarnpkg.com/react-bootstrap-typeahead/-/react-bootstrap-typeahead-3.4.1.tgz#484c3c1be635c49898ca8dce59a6c71f2fce5888"
+  integrity sha512-Isutst1PaIO+GSlyDfoAskCdvp5biyUIL/VdDjfSYFaFmZ89W8pSCJ6rALowkvTlCVxoRHJMrmhxb/5KOTAPzQ==
   dependencies:
     classnames "^2.2.0"
+    create-react-context "^0.2.3"
     escape-string-regexp "^1.0.5"
     invariant "^2.2.1"
     lodash "^4.17.2"
     prop-types "^15.5.8"
     prop-types-extra "^1.0.1"
-    react-onclickoutside "^6.1.1"
     react-overlays "^0.8.1"
     react-popper "^1.0.0"
     warning "^4.0.1"
@@ -9726,6 +10077,19 @@ react-copy-to-clipboard@5.x:
     copy-to-clipboard "^3"
     prop-types "^15.5.8"
 
+react-diff-view@^1.8.1:
+  version "1.8.1"
+  resolved "https://registry.yarnpkg.com/react-diff-view/-/react-diff-view-1.8.1.tgz#0b9b4adcb92de6730d28177d68654dfcc2097f73"
+  integrity sha512-+soJL85Xnsak/VOdxSgiDKhhaFiOkckiswwrXdiWVCxV3LP9POyJR4AqGVFGdkntJ3YT63mtwTYuunFeId+XSA==
+  dependencies:
+    classnames "^2.2.6"
+    gitdiff-parser "^0.1.2"
+    leven "^2.1.0"
+    lodash.escape "^4.0.1"
+    lodash.findlastindex "^4.6.0"
+    lodash.mapvalues "^4.6.0"
+    warning "^4.0.1"
+
 react-dnd-html5-backend@^2.6.0:
   version "2.6.0"
   resolved "https://registry.yarnpkg.com/react-dnd-html5-backend/-/react-dnd-html5-backend-2.6.0.tgz#590cd1cca78441bb274edd571fef4c0b16ddcf8e"
@@ -9805,10 +10169,6 @@ react-motion@^0.5.2:
     prop-types "^15.5.8"
     raf "^3.1.0"
 
-react-onclickoutside@^6.1.1:
-  version "6.7.1"
-  resolved "https://registry.yarnpkg.com/react-onclickoutside/-/react-onclickoutside-6.7.1.tgz#6a5b5b8b4eae6b776259712c89c8a2b36b17be93"
-
 react-overlays@^0.8.0, react-overlays@^0.8.1:
   version "0.8.3"
   resolved "https://registry.yarnpkg.com/react-overlays/-/react-overlays-0.8.3.tgz#fad65eea5b24301cca192a169f5dddb0b20d3ac5"
@@ -10006,7 +10366,7 @@ read-pkg@^3.0.0:
     normalize-package-data "^2.3.2"
     path-type "^3.0.0"
 
-"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.6, readable-stream@^2.1.4, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6:
+"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.6, readable-stream@^2.1.4, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6:
   version "2.3.6"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"
   dependencies:
@@ -10039,7 +10399,7 @@ readable-stream@^2.3.5, readable-stream@~2.3.3:
     string_decoder "~1.0.3"
     util-deprecate "~1.0.1"
 
-readable-stream@~1.1.9:
+readable-stream@~1.1.0, readable-stream@~1.1.9:
   version "1.1.14"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9"
   dependencies:
@@ -10109,6 +10469,12 @@ redent@^1.0.0:
     indent-string "^2.1.0"
     strip-indent "^1.0.1"
 
+redeyed@~0.4.0:
+  version "0.4.4"
+  resolved "https://registry.yarnpkg.com/redeyed/-/redeyed-0.4.4.tgz#37e990a6f2b21b2a11c2e6a48fd4135698cba97f"
+  dependencies:
+    esprima "~1.0.4"
+
 reduce-css-calc@^1.2.6:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/reduce-css-calc/-/reduce-css-calc-1.3.0.tgz#747c914e049614a4c9cfbba629871ad1d2927716"
@@ -10164,10 +10530,20 @@ redux@^4.0.0:
     loose-envify "^1.1.0"
     symbol-observable "^1.2.0"
 
+regenerate-unicode-properties@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-7.0.0.tgz#107405afcc4a190ec5ed450ecaa00ed0cafa7a4c"
+  dependencies:
+    regenerate "^1.4.0"
+
 regenerate@^1.2.1:
   version "1.3.3"
   resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.3.3.tgz#0c336d3980553d755c39b586ae3b20aa49c82b7f"
 
+regenerate@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.0.tgz#4a856ec4b56e4077c557589cae85e7a4c8869a11"
+
 regenerator-runtime@^0.11.0:
   version "0.11.1"
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"
@@ -10201,6 +10577,10 @@ regex-parser@^2.2.9:
   version "2.2.9"
   resolved "https://registry.yarnpkg.com/regex-parser/-/regex-parser-2.2.9.tgz#a372f45a248b62976a568037c1b6e60a60599192"
 
+regex-regex@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/regex-regex/-/regex-regex-1.0.0.tgz#9048a1eaeb870f4d480dabc76fc42cdcc0bc3a72"
+
 regexpp@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-1.0.1.tgz#d857c3a741dce075c2848dcb019a0a975b190d43"
@@ -10221,19 +10601,108 @@ regexpu-core@^2.0.0:
     regjsgen "^0.2.0"
     regjsparser "^0.1.4"
 
+regexpu-core@^4.2.0:
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.4.0.tgz#8d43e0d1266883969720345e70c275ee0aec0d32"
+  dependencies:
+    regenerate "^1.4.0"
+    regenerate-unicode-properties "^7.0.0"
+    regjsgen "^0.5.0"
+    regjsparser "^0.6.0"
+    unicode-match-property-ecmascript "^1.0.4"
+    unicode-match-property-value-ecmascript "^1.0.2"
+
 regjsgen@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.2.0.tgz#6c016adeac554f75823fe37ac05b92d5a4edb1f7"
 
+regjsgen@^0.5.0:
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.0.tgz#a7634dc08f89209c2049adda3525711fb97265dd"
+
 regjsparser@^0.1.4:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.1.5.tgz#7ee8f84dc6fa792d3fd0ae228d24bd949ead205c"
   dependencies:
     jsesc "~0.5.0"
 
-regl@^1.3.0:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/regl/-/regl-1.3.1.tgz#2995e63a7984c520ef2da0f6f1027f7051338140"
+regjsparser@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.0.tgz#f1e6ae8b7da2bae96c99399b868cd6c933a2ba9c"
+  dependencies:
+    jsesc "~0.5.0"
+
+regl-error2d@^2.0.6:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/regl-error2d/-/regl-error2d-2.0.6.tgz#0d980b4b0e5b8fba23b3bf16b51a29daad7ccc0d"
+  dependencies:
+    array-bounds "^1.0.1"
+    bubleify "^1.0.0"
+    color-normalize "^1.0.3"
+    flatten-vertex-data "^1.0.0"
+    object-assign "^4.1.1"
+    pick-by-alias "^1.1.1"
+    to-float32 "^1.0.0"
+    update-diff "^1.0.2"
+
+regl-line2d@3.0.13:
+  version "3.0.13"
+  resolved "https://registry.yarnpkg.com/regl-line2d/-/regl-line2d-3.0.13.tgz#0300dc523f95145b553ac59740f9d798e5f1e73f"
+  dependencies:
+    array-bounds "^1.0.0"
+    array-normalize "^1.1.3"
+    bubleify "^1.0.0"
+    color-normalize "^1.0.0"
+    earcut "^2.1.1"
+    es6-weak-map "^2.0.2"
+    flatten-vertex-data "^1.0.0"
+    glslify "^7.0.0"
+    object-assign "^4.1.1"
+    parse-rect "^1.2.0"
+    pick-by-alias "^1.1.0"
+    to-float32 "^1.0.0"
+
+regl-scatter2d@^3.1.2, regl-scatter2d@^3.1.3:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/regl-scatter2d/-/regl-scatter2d-3.1.3.tgz#1ddd8572fd02b3fbe2baca9a7fe08fd6ec73a802"
+  dependencies:
+    array-range "^1.0.1"
+    array-rearrange "^2.2.2"
+    clamp "^1.0.1"
+    color-id "^1.1.0"
+    color-normalize "^1.3.0"
+    color-rgba "^2.1.0"
+    flatten-vertex-data "^1.0.2"
+    glslify "^7.0.0"
+    image-palette "^2.1.0"
+    is-iexplorer "^1.0.0"
+    object-assign "^4.1.1"
+    parse-rect "^1.2.0"
+    pick-by-alias "^1.2.0"
+    point-cluster "^3.1.4"
+    to-float32 "^1.0.1"
+    update-diff "^1.1.0"
+
+regl-splom@^1.0.6:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/regl-splom/-/regl-splom-1.0.6.tgz#c14dba179d93490722e23d9d4751184cd247320e"
+  dependencies:
+    array-bounds "^1.0.1"
+    array-range "^1.0.1"
+    bubleify "^1.2.0"
+    color-alpha "^1.0.3"
+    defined "^1.0.0"
+    flatten-vertex-data "^1.0.2"
+    left-pad "^1.3.0"
+    parse-rect "^1.2.0"
+    pick-by-alias "^1.2.0"
+    point-cluster "^3.1.4"
+    raf "^3.4.1"
+    regl-scatter2d "^3.1.2"
+
+regl@^1.3.11, regl@^1.3.6:
+  version "1.3.11"
+  resolved "https://registry.yarnpkg.com/regl/-/regl-1.3.11.tgz#515e5173ffdc0618f908dd4e338a34ae9555f745"
 
 relateurl@0.2.x:
   version "0.2.7"
@@ -10295,7 +10764,7 @@ request-promise-native@^1.0.5:
     stealthy-require "^1.1.0"
     tough-cookie ">=2.3.3"
 
-request@2, request@^2.39.0, request@^2.78.0, request@^2.79.0:
+request@2, request@^2.78.0, request@^2.79.0:
   version "2.85.0"
   resolved "https://registry.yarnpkg.com/request/-/request-2.85.0.tgz#5a03615a47c61420b3eb99b7dba204f83603e1fa"
   dependencies:
@@ -10646,9 +11115,9 @@ run-queue@^1.0.0, run-queue@^1.0.3:
   dependencies:
     aproba "^1.1.1"
 
-rw@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/rw/-/rw-0.1.4.tgz#4903cbd80248ae0ede685bf58fd236a7a9b29a3e"
+rw@^1.3.3:
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/rw/-/rw-1.3.3.tgz#3f862dfa91ab766b14885ef4d01124bfda074fb4"
 
 rx-lite-aggregates@^4.0.8:
   version "4.0.8"
@@ -10777,6 +11246,10 @@ scss-tokenizer@^0.2.3:
     js-base64 "^2.1.8"
     source-map "^0.4.2"
 
+seedrandom@^2.4.2:
+  version "2.4.4"
+  resolved "https://registry.yarnpkg.com/seedrandom/-/seedrandom-2.4.4.tgz#b25ea98632c73e45f58b77cfaa931678df01f9ba"
+
 selenium-webdriver@3.6.0, selenium-webdriver@^3.0.1:
   version "3.6.0"
   resolved "https://registry.yarnpkg.com/selenium-webdriver/-/selenium-webdriver-3.6.0.tgz#2ba87a1662c020b8988c981ae62cb2a01298eafc"
@@ -10890,6 +11363,17 @@ shallowequal@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/shallowequal/-/shallowequal-1.0.2.tgz#1561dbdefb8c01408100319085764da3fcf83f8f"
 
+sharkdown@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/sharkdown/-/sharkdown-0.1.0.tgz#61d4fe529e75d02442127cc9234362265099214f"
+  dependencies:
+    cardinal "~0.4.2"
+    expect.js "~0.2.0"
+    minimist "0.0.5"
+    split "~0.2.10"
+    stream-spigot "~2.1.2"
+    through "~2.3.4"
+
 shebang-command@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
@@ -10900,10 +11384,6 @@ shebang-regex@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
 
-shelf-pack@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/shelf-pack/-/shelf-pack-1.1.0.tgz#b4679afdd00ad68dfd9bbd2b5a3e819293a74d82"
-
 shell-quote@^1.6.1:
   version "1.6.1"
   resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.6.1.tgz#f4781949cce402697127430ea3b3c5476f481767"
@@ -10931,6 +11411,12 @@ showdown@1.8.x:
   dependencies:
     yargs "^10.0.3"
 
+shuffle-seed@^1.1.6:
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/shuffle-seed/-/shuffle-seed-1.1.6.tgz#533c12683bab3b4fa3e8751fc4e562146744260b"
+  dependencies:
+    seedrandom "^2.4.2"
+
 signal-exit@^3.0.0, signal-exit@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
@@ -11006,18 +11492,6 @@ slide@^1.1.5:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/slide/-/slide-1.1.6.tgz#56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707"
 
-snap-points-2d@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/snap-points-2d/-/snap-points-2d-1.0.1.tgz#8a679a47e195fa31405b03dc6e0c03e18228dcf4"
-  dependencies:
-    typedarray-pool "^1.1.0"
-
-snap-points-2d@^3.0.0, snap-points-2d@^3.1.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/snap-points-2d/-/snap-points-2d-3.2.0.tgz#0e19e22a3a0e96bce21cdf5c7f1d7ed5b96745f0"
-  dependencies:
-    array-bounds "^1.0.1"
-
 snapdragon-node@^2.0.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b"
@@ -11139,7 +11613,7 @@ source-map@0.5.x, source-map@^0.5.3, source-map@^0.5.6, source-map@^0.5.7, sourc
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
 
-source-map@^0.1.34, source-map@^0.1.38, source-map@~0.1.33:
+source-map@^0.1.38, source-map@~0.1.33:
   version "0.1.43"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.1.43.tgz#c24bc146ca517c1471f5dacbe2571b2b7f9e3346"
   dependencies:
@@ -11155,6 +11629,10 @@ source-map@^0.7.2:
   version "0.7.3"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383"
 
+sourcemap-codec@^1.4.1:
+  version "1.4.4"
+  resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.4.tgz#c63ea927c029dd6bd9a2b7fa03b3fec02ad56e9f"
+
 spdx-correct@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.0.0.tgz#05a5b4d7153a195bc92c3c425b69f3b2a9524c82"
@@ -11190,6 +11668,12 @@ split-string@^3.0.1, split-string@^3.0.2:
   dependencies:
     extend-shallow "^3.0.0"
 
+split@~0.2.10:
+  version "0.2.10"
+  resolved "https://registry.yarnpkg.com/split/-/split-0.2.10.tgz#67097c601d697ce1368f418f06cd201cf0521a57"
+  dependencies:
+    through "2"
+
 sprintf-js@^1.0.3, sprintf-js@~1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
@@ -11325,6 +11809,12 @@ stream-shift@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.0.tgz#d5c752825e5367e786f78e18e445ea223a155952"
 
+stream-spigot@~2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/stream-spigot/-/stream-spigot-2.1.2.tgz#7de145e819f8dd0db45090d13dcf73a8ed3cc035"
+  dependencies:
+    readable-stream "~1.1.0"
+
 stream-to-observable@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/stream-to-observable/-/stream-to-observable-0.2.0.tgz#59d6ea393d87c2c0ddac10aa0d561bc6ba6f0e10"
@@ -11342,10 +11832,23 @@ string-length@^2.0.0:
     astral-regex "^1.0.0"
     strip-ansi "^4.0.0"
 
+string-split-by@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/string-split-by/-/string-split-by-1.0.0.tgz#53895fb3397ebc60adab1f1e3a131f5372586812"
+  dependencies:
+    parenthesis "^3.1.5"
+
 string-template@~0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/string-template/-/string-template-0.2.1.tgz#42932e598a352d01fc22ec3367d9d84eec6c9add"
 
+string-to-arraybuffer@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/string-to-arraybuffer/-/string-to-arraybuffer-1.0.2.tgz#161147fbadea02e28b0935002cec4c40f1ca7f0a"
+  dependencies:
+    atob-lite "^2.0.0"
+    is-base64 "^0.1.0"
+
 string-width@^1.0.1, string-width@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
@@ -11420,6 +11923,10 @@ strip-bom-stream@^2.0.0:
     first-chunk-stream "^2.0.0"
     strip-bom "^2.0.0"
 
+strip-bom-string@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/strip-bom-string/-/strip-bom-string-1.0.0.tgz#e5211e9224369fbb81d633a2f00044dc8cedad92"
+
 strip-bom@3.0.0, strip-bom@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
@@ -11462,7 +11969,7 @@ subarg@^1.0.0:
   dependencies:
     minimist "^1.1.0"
 
-supercluster@^2.0.1:
+supercluster@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/supercluster/-/supercluster-2.3.0.tgz#87ab56081bbea9a1d724df5351ee9e8c3af2f48b"
   dependencies:
@@ -11502,6 +12009,29 @@ surface-nets@^1.0.0, surface-nets@^1.0.2:
     triangulate-hypercube "^1.0.0"
     zero-crossings "^1.0.0"
 
+svg-arc-to-cubic-bezier@^3.0.0:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/svg-arc-to-cubic-bezier/-/svg-arc-to-cubic-bezier-3.1.3.tgz#7b5f76445310ef03238964c39ae7dbc761fda879"
+
+svg-path-bounds@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/svg-path-bounds/-/svg-path-bounds-1.0.1.tgz#bf458b783726bf53431b4633f2792f60748d9f74"
+  dependencies:
+    abs-svg-path "^0.1.1"
+    is-svg-path "^1.0.1"
+    normalize-svg-path "^1.0.0"
+    parse-svg-path "^0.1.2"
+
+svg-path-sdf@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/svg-path-sdf/-/svg-path-sdf-1.1.3.tgz#92957a31784c0eaf68945472c8dc6bf9e6d126fc"
+  dependencies:
+    bitmap-sdf "^1.0.0"
+    draw-svg-path "^1.0.0"
+    is-svg-path "^1.0.1"
+    parse-svg-path "^0.1.2"
+    svg-path-bounds "^1.0.1"
+
 svgo@^0.7.0:
   version "0.7.2"
   resolved "https://registry.yarnpkg.com/svgo/-/svgo-0.7.2.tgz#9f5772413952135c6fefbf40afe6a4faa88b4bb5"
@@ -11553,7 +12083,7 @@ tapable@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.0.0.tgz#cbb639d9002eed9c6b5975eb20598d7936f1f9f2"
 
-tape@^4.0.0, tape@^4.6.0:
+tape@^4.0.0:
   version "4.9.0"
   resolved "https://registry.yarnpkg.com/tape/-/tape-4.9.0.tgz#855c08360395133709d34d3fbf9ef341eb73ca6a"
   dependencies:
@@ -11628,11 +12158,11 @@ test-exclude@^4.1.1:
     read-pkg-up "^1.0.1"
     require-main-filename "^1.0.1"
 
-text-cache@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/text-cache/-/text-cache-4.1.0.tgz#7c58090e85ac0910f976df4cfc8ce8aa0ea58766"
+text-cache@^4.2.1:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/text-cache/-/text-cache-4.2.1.tgz#c89e2407827c288f668b3a3454912511c2364245"
   dependencies:
-    vectorize-text "^3.0.1"
+    vectorize-text "^3.2.1"
 
 text-encoding@0.x:
   version "0.6.4"
@@ -11672,6 +12202,13 @@ through2@^2.0.0, through2@^2.0.1, through2@~2.0.3:
     readable-stream "^2.1.5"
     xtend "~4.0.1"
 
+through2@^2.0.3:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd"
+  dependencies:
+    readable-stream "~2.3.6"
+    xtend "~4.0.1"
+
 through2@~0.4.1:
   version "0.4.2"
   resolved "https://registry.yarnpkg.com/through2/-/through2-0.4.2.tgz#dbf5866031151ec8352bb6c4db64a2292a840b9b"
@@ -11679,7 +12216,7 @@ through2@~0.4.1:
     readable-stream "~1.0.17"
     xtend "~2.1.1"
 
-through@^2.3.6, through@^2.3.7, through@^2.3.8, through@~2.3.4, through@~2.3.8:
+through@2, through@^2.3.6, through@^2.3.8, through@~2.3.4, through@~2.3.8:
   version "2.3.8"
   resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
 
@@ -11705,12 +12242,23 @@ tinycolor2@^1.3.0:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/tinycolor2/-/tinycolor2-1.4.1.tgz#f4fad333447bc0b07d4dc8e9209d8f39a8ac77e8"
 
+tinyqueue@^1.1.0:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/tinyqueue/-/tinyqueue-1.2.3.tgz#b6a61de23060584da29f82362e45df1ec7353f3d"
+
 tippy.js@^3.2.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/tippy.js/-/tippy.js-3.3.0.tgz#90d4f90be9c80fdc0d0025f49378e3d9f60508d3"
   dependencies:
     popper.js "^1.14.6"
 
+tippy.js@^3.4.1:
+  version "3.4.1"
+  resolved "https://registry.yarnpkg.com/tippy.js/-/tippy.js-3.4.1.tgz#f0eb3081824ad6c5d364336451ad77ae2f543da8"
+  integrity sha512-ZiyGP9WZyCCcjxKM4G88cm4U1r1ytjeMDGa5FSKPaPzwc/3yZJVZsb1ffcmqUMCpryRp5LNxRNGKLzbs11sb/Q==
+  dependencies:
+    popper.js "^1.14.6"
+
 tmp@0.0.30:
   version "0.0.30"
   resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.30.tgz#72419d4a8be7d6ce75148fd8b324e593a711c2ed"
@@ -11727,6 +12275,14 @@ tmpl@1.0.x:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.4.tgz#23640dd7b42d00433911140820e5cf440e521dd1"
 
+to-array-buffer@^3.0.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/to-array-buffer/-/to-array-buffer-3.2.0.tgz#cb684dd691a7368c3b249c2348d75227f7d4dbb4"
+  dependencies:
+    flatten-vertex-data "^1.0.2"
+    is-blob "^2.0.1"
+    string-to-arraybuffer "^1.0.0"
+
 to-arraybuffer@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz#7d229b1fcc637e466ca081180836a7aabff83f43"
@@ -11739,6 +12295,10 @@ to-fast-properties@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e"
 
+to-float32@^1.0.0, to-float32@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/to-float32/-/to-float32-1.0.1.tgz#22d5921f38183164b9e7e9876158c0c16cb9753a"
+
 to-object-path@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af"
@@ -11767,9 +12327,15 @@ to-regex@^3.0.1, to-regex@^3.0.2:
     regex-not "^1.0.2"
     safe-regex "^1.1.0"
 
-to-utf8@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/to-utf8/-/to-utf8-0.0.1.tgz#d17aea72ff2fba39b9e43601be7b3ff72e089852"
+to-uint8@^1.4.1:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/to-uint8/-/to-uint8-1.4.1.tgz#9f45694905b827f247d37bc8ec83b2818d81fac9"
+  dependencies:
+    arr-flatten "^1.1.0"
+    clamp "^1.0.1"
+    is-base64 "^0.1.0"
+    is-float-array "^1.0.0"
+    to-array-buffer "^3.0.0"
 
 toggle-selection@^1.0.3:
   version "1.0.6"
@@ -11935,6 +12501,10 @@ type-is@~1.6.16:
     media-typer "0.3.0"
     mime-types "~2.1.18"
 
+type-name@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/type-name/-/type-name-2.0.2.tgz#efe7d4123d8ac52afff7f40c7e4dec5266008fb4"
+
 typed-styles@^0.0.5:
   version "0.0.5"
   resolved "https://registry.yarnpkg.com/typed-styles/-/typed-styles-0.0.5.tgz#a60df245d482a9b1adf9c06c078d0f06085ed1cf"
@@ -12009,29 +12579,6 @@ uid-number@^0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/uid-number/-/uid-number-0.0.6.tgz#0ea10e8035e8eb5b8e4449f06da1c730663baa81"
 
-unassert@^1.3.1:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/unassert/-/unassert-1.5.1.tgz#cbc88ec387417c5a5e4c02d3cd07be98bd75ff76"
-  dependencies:
-    acorn "^4.0.0"
-    call-matcher "^1.0.1"
-    deep-equal "^1.0.0"
-    espurify "^1.3.0"
-    estraverse "^4.1.0"
-    esutils "^2.0.2"
-    object-assign "^4.1.0"
-
-unassertify@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/unassertify/-/unassertify-2.1.0.tgz#6b07abf5c6598ba3852a27a676caad1df526a96d"
-  dependencies:
-    acorn "^5.1.0"
-    convert-source-map "^1.1.1"
-    escodegen "^1.6.1"
-    multi-stage-sourcemap "^0.2.1"
-    through "^2.3.7"
-    unassert "^1.3.1"
-
 uncontrollable@^5.0.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/uncontrollable/-/uncontrollable-5.1.0.tgz#7e9a1c50ea24e3c78b625e52d21ff3f758c7bd59"
@@ -12046,6 +12593,32 @@ underscore@~1.6.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.6.0.tgz#8b38b10cacdef63337b8b24e4ff86d45aea529a8"
 
+unicode-canonical-property-names-ecmascript@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz#2619800c4c825800efdd8343af7dd9933cbe2818"
+
+unicode-match-property-ecmascript@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-1.0.4.tgz#8ed2a32569961bce9227d09cd3ffbb8fed5f020c"
+  dependencies:
+    unicode-canonical-property-names-ecmascript "^1.0.4"
+    unicode-property-aliases-ecmascript "^1.0.4"
+
+unicode-match-property-value-ecmascript@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.0.2.tgz#9f1dc76926d6ccf452310564fd834ace059663d4"
+
+unicode-property-aliases-ecmascript@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.0.4.tgz#5a533f31b4317ea76f17d807fa0d116546111dd0"
+
+unidiff@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/unidiff/-/unidiff-1.0.1.tgz#2ff8da0710a9abb4e1133e9da4c87747fb5ff508"
+  integrity sha512-n9pCo9OKQE+QWsUa45BdSy7Y0hpHpyPHwNxcEgqFgPqxb1Y8DH4d9WTepcJpmLsnDEWDch6hxh2g/sM0bvyxMA==
+  dependencies:
+    diff "^2.2.2"
+
 union-find@^1.0.0, union-find@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/union-find/-/union-find-1.0.2.tgz#292bac415e6ad3a89535d237010db4a536284e58"
@@ -12089,10 +12662,6 @@ unique-slug@^2.0.0:
   dependencies:
     imurmurhash "^0.1.4"
 
-unitbezier@^0.0.0:
-  version "0.0.0"
-  resolved "https://registry.yarnpkg.com/unitbezier/-/unitbezier-0.0.0.tgz#33bf7f5d7284c5350bfc5c7f770fba7549c54a5e"
-
 universalify@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.1.tgz#fa71badd4437af4c148841e3b3b165f9e9e590b7"
@@ -12101,6 +12670,10 @@ unpipe@1.0.0, unpipe@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
 
+unquote@^1.1.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/unquote/-/unquote-1.1.1.tgz#8fded7324ec6e88a0ff8b905e7c098cdc086d544"
+
 unset-value@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559"
@@ -12116,6 +12689,10 @@ upath@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/upath/-/upath-1.1.0.tgz#35256597e46a581db4793d0ce47fa9aebfc9fabd"
 
+update-diff@^1.0.2, update-diff@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/update-diff/-/update-diff-1.1.0.tgz#f510182d81ee819fb82c3a6b22b62bbdeda7808f"
+
 upper-case@^1.1.1:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/upper-case/-/upper-case-1.1.3.tgz#f6b4501c2ec4cdd26ba78be7222961de77621598"
@@ -12192,10 +12769,45 @@ utila@~0.4:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/utila/-/utila-0.4.0.tgz#8a16a05d445657a3aea5eecc5b12a4fa5379772c"
 
+utils-copy-error@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/utils-copy-error/-/utils-copy-error-1.0.1.tgz#791de393c0f09890afd59f3cbea635f079a94fa5"
+  dependencies:
+    object-keys "^1.0.9"
+    utils-copy "^1.1.0"
+
+utils-copy@^1.0.0, utils-copy@^1.1.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/utils-copy/-/utils-copy-1.1.1.tgz#6e2b97982aa8cd73e1182a3e6f8bec3c0f4058a7"
+  dependencies:
+    const-pinf-float64 "^1.0.0"
+    object-keys "^1.0.9"
+    type-name "^2.0.0"
+    utils-copy-error "^1.0.0"
+    utils-indexof "^1.0.0"
+    utils-regex-from-string "^1.0.0"
+    validate.io-array "^1.0.3"
+    validate.io-buffer "^1.0.1"
+    validate.io-nonnegative-integer "^1.0.0"
+
+utils-indexof@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/utils-indexof/-/utils-indexof-1.0.0.tgz#20feabf09ef1018b523643e8380e7bc83ec61b5c"
+  dependencies:
+    validate.io-array-like "^1.0.1"
+    validate.io-integer-primitive "^1.0.0"
+
 utils-merge@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
 
+utils-regex-from-string@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/utils-regex-from-string/-/utils-regex-from-string-1.0.0.tgz#fe1a2909f8de0ff0d5182c80fbc654d6a687d189"
+  dependencies:
+    regex-regex "^1.0.0"
+    validate.io-string-primitive "^1.0.0"
+
 uuid@^2.0.0:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-2.0.3.tgz#67e2e863797215530dff318e5bf9dcebfd47b21a"
@@ -12219,6 +12831,65 @@ validate-npm-package-license@^3.0.1:
     spdx-correct "^3.0.0"
     spdx-expression-parse "^3.0.0"
 
+validate.io-array-like@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/validate.io-array-like/-/validate.io-array-like-1.0.2.tgz#7af9f7eb7b51715beb2215668ec5cce54faddb5a"
+  dependencies:
+    const-max-uint32 "^1.0.2"
+    validate.io-integer-primitive "^1.0.0"
+
+validate.io-array@^1.0.3, validate.io-array@^1.0.6:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/validate.io-array/-/validate.io-array-1.0.6.tgz#5b5a2cafd8f8b85abb2f886ba153f2d93a27774d"
+
+validate.io-buffer@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/validate.io-buffer/-/validate.io-buffer-1.0.2.tgz#852d6734021914d5d13afc32531761e3720ed44e"
+
+validate.io-integer-primitive@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/validate.io-integer-primitive/-/validate.io-integer-primitive-1.0.0.tgz#a9aa010355fe8681c0fea6c1a74ad2419cadddc6"
+  dependencies:
+    validate.io-number-primitive "^1.0.0"
+
+validate.io-integer@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/validate.io-integer/-/validate.io-integer-1.0.5.tgz#168496480b95be2247ec443f2233de4f89878068"
+  dependencies:
+    validate.io-number "^1.0.3"
+
+validate.io-matrix-like@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/validate.io-matrix-like/-/validate.io-matrix-like-1.0.2.tgz#5ec32a75d0889dac736dea68bdd6145b155edfc3"
+
+validate.io-ndarray-like@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/validate.io-ndarray-like/-/validate.io-ndarray-like-1.0.0.tgz#d8a3b0ed165bbf1d2fc0d0073270cfa552295919"
+
+validate.io-nonnegative-integer@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/validate.io-nonnegative-integer/-/validate.io-nonnegative-integer-1.0.0.tgz#8069243a08c5f98e95413c929dfd7b18f3f6f29f"
+  dependencies:
+    validate.io-integer "^1.0.5"
+
+validate.io-number-primitive@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/validate.io-number-primitive/-/validate.io-number-primitive-1.0.0.tgz#d2e01f202989369dcf1155449564203afe584e55"
+
+validate.io-number@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/validate.io-number/-/validate.io-number-1.0.3.tgz#f63ffeda248bf28a67a8d48e0e3b461a1665baf8"
+
+validate.io-positive-integer@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/validate.io-positive-integer/-/validate.io-positive-integer-1.0.0.tgz#7ed2d03b4c27558cc66a00aab0f0e921814a6582"
+  dependencies:
+    validate.io-integer "^1.0.5"
+
+validate.io-string-primitive@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/validate.io-string-primitive/-/validate.io-string-primitive-1.0.1.tgz#b8135b9fb1372bde02fdd53ad1d0ccd6de798fee"
+
 value-equal@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/value-equal/-/value-equal-0.4.0.tgz#c5bdd2f54ee093c04839d71ce2e4758a6890abc7"
@@ -12227,15 +12898,9 @@ vary@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
 
-vector-tile@^1.1.3, vector-tile@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/vector-tile/-/vector-tile-1.3.0.tgz#06d516a83b063f04c82ef539cf1bb1aebeb696b4"
-  dependencies:
-    point-geometry "0.0.0"
-
-vectorize-text@^3.0.0, vectorize-text@^3.0.1:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/vectorize-text/-/vectorize-text-3.0.2.tgz#05ab1630e409f377964e2b9205b2d559a92f60d8"
+vectorize-text@^3.2.1:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/vectorize-text/-/vectorize-text-3.2.1.tgz#85921abd9685af775fd20a01041a2837fe51bdb5"
   dependencies:
     cdt2d "^1.0.0"
     clean-pslg "^1.1.0"
@@ -12291,19 +12956,23 @@ vlq@^0.2.2:
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/vlq/-/vlq-0.2.3.tgz#8f3e4328cf63b1540c0d67e1b2778386f8975b26"
 
+vlq@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/vlq/-/vlq-1.0.0.tgz#8101be90843422954c2b13eb27f2f3122bdcc806"
+
 vm-browserify@0.0.4:
   version "0.0.4"
   resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-0.0.4.tgz#5d7ea45bbef9e4a6ff65f95438e0a87c357d5a73"
   dependencies:
     indexof "0.0.1"
 
-vt-pbf@^2.0.2:
-  version "2.1.4"
-  resolved "https://registry.yarnpkg.com/vt-pbf/-/vt-pbf-2.1.4.tgz#b5df7c3f9706156e0b9881a99dcb05635740b522"
+vt-pbf@^3.0.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/vt-pbf/-/vt-pbf-3.1.1.tgz#b0f627e39a10ce91d943b898ed2363d21899fb82"
   dependencies:
-    pbf "^1.3.2"
-    point-geometry "0.0.0"
-    vector-tile "^1.1.3"
+    "@mapbox/point-geometry" "0.1.0"
+    "@mapbox/vector-tile" "^1.3.1"
+    pbf "^3.0.5"
 
 vue-parser@^1.1.5:
   version "1.1.6"
@@ -12485,10 +13154,6 @@ webpack@4.12.0:
     watchpack "^1.5.0"
     webpack-sources "^1.0.1"
 
-webworkify@^1.3.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/webworkify/-/webworkify-1.5.0.tgz#734ad87a774de6ebdd546e1d3e027da5b8f4a42c"
-
 wgs84@0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/wgs84/-/wgs84-0.0.0.tgz#34fdc555917b6e57cf2a282ed043710c049cdc76"
@@ -12558,10 +13223,6 @@ which@1, which@^1.2.12, which@^1.2.14, which@^1.2.9, which@^1.3.0:
   dependencies:
     isexe "^2.0.0"
 
-whoots-js@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/whoots-js/-/whoots-js-2.1.0.tgz#bcb201c34e0eaf335fcce5ae2cf874579a99c487"
-
 wide-align@^1.1.0:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.2.tgz#571e0f1b0604636ebc0dfc21b0339bbe31341710"
diff --git a/test-prow-e2e.sh b/test-prow-e2e.sh
index 0b7933c52ad..d55748bf3cb 100755
--- a/test-prow-e2e.sh
+++ b/test-prow-e2e.sh
@@ -22,4 +22,4 @@ export BRIDGE_AUTH_PASSWORD="$(cat "${INSTALLER_DIR}/auth/kubeadmin-password")"
 set -x
 export BRIDGE_BASE_ADDRESS="https://$(oc get route console -n openshift-console -o jsonpath='{.spec.host}')"
 
-./test-gui.sh e2e
+./test-gui.sh ${1:-e2e}