diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 0c6340d6a2..afbcc74367 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -18,7 +18,7 @@ jobs:
         uses: actions/setup-python@v2
         with:
           python-version: '3.x'
-          
+
       - name: Checkout Release from lens
         uses: actions/checkout@v2
         with:
@@ -83,12 +83,12 @@ jobs:
            mike deploy --push master
 
       - name: Get the release version
-        if: contains(github.ref, 'refs/tags/v') # && !github.event.release.prerelease (generate pre-release docs until Lens 4.0.0 is GA, see #1408)
+        if: contains(github.ref, 'refs/tags/v') && !github.event.release.prerelease
         id: get_version
         run: echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\//}
 
       - name: mkdocs deploy new release
-        if: contains(github.ref, 'refs/tags/v') # && !github.event.release.prerelease (generate pre-release docs until Lens 4.0.0 is GA, see #1408)
+        if: contains(github.ref, 'refs/tags/v') && !github.event.release.prerelease
         run: |
            mike deploy --push --update-aliases ${{ steps.get_version.outputs.VERSION }} latest
            mike set-default --push ${{ steps.get_version.outputs.VERSION }}
diff --git a/docs/extensions/guides/images/clusterpagemenus.png b/docs/extensions/guides/images/clusterpagemenus.png
new file mode 100644
index 0000000000..3ed1c79e5b
Binary files /dev/null and b/docs/extensions/guides/images/clusterpagemenus.png differ
diff --git a/docs/extensions/guides/images/globalpagemenus.png b/docs/extensions/guides/images/globalpagemenus.png
new file mode 100644
index 0000000000..e986cc32e9
Binary files /dev/null and b/docs/extensions/guides/images/globalpagemenus.png differ
diff --git a/docs/extensions/guides/renderer-extension.md b/docs/extensions/guides/renderer-extension.md
index f64cb5fd49..c3ff953b2a 100644
--- a/docs/extensions/guides/renderer-extension.md
+++ b/docs/extensions/guides/renderer-extension.md
@@ -1,13 +1,26 @@
 # Renderer Extension
 
-The renderer extension api is the interface to Lens's renderer process (Lens runs in main and renderer processes).
-It allows you to access, configure, and customize Lens data, add custom Lens UI elements, and generally run custom code in Lens's renderer process.
-The custom Lens UI elements that can be added include global pages, cluster pages, cluster page menus, cluster features, app preferences, status bar items, KubeObject menu items, and KubeObject details items.
-These UI elements are based on React components.
+The Renderer Extension API is the interface to Lens's renderer process. Lens runs in both the main and renderer processes. The Renderer Extension API allows you to access, configure, and customize Lens data, add custom Lens UI elements, and run custom code in Lens's renderer process.
+
+The custom Lens UI elements that you can add include:
+
+* [Cluster pages](#clusterpages)
+* [Cluster page menus](#clusterpagemenus)
+* [Global pages](#globalpages)
+* [Global page menus](#globalpagemenus)
+* [Cluster features](#clusterfeatures)
+* [App preferences](#apppreferences)
+* [Status bar items](#statusbaritems)
+* [KubeObject menu items](#kubeobjectmenuitems)
+* [KubeObject detail items](#kubeobjectdetailitems)
+
+All UI elements are based on React components.
 
 ## `LensRendererExtension` Class
 
-To create a renderer extension simply extend the `LensRendererExtension` class:
+### `onActivate()` and `onDeactivate()` Methods
+
+To create a renderer extension, extend the `LensRendererExtension` class:
 
 ``` typescript
 import { LensRendererExtension } from "@k8slens/extensions";
@@ -23,21 +36,21 @@ export default class ExampleExtensionMain extends LensRendererExtension {
 }
 ```
 
-There are two methods that you can implement to facilitate running your custom code.
-`onActivate()` is called when your extension has been successfully enabled.
-By implementing `onActivate()` you can initiate your custom code.
-`onDeactivate()` is called when the extension is disabled (typically from the [Lens Extensions Page]()) and when implemented gives you a chance to clean up after your extension, if necessary.
-The example above simply logs messages when the extension is enabled and disabled.
+Two methods enable you to run custom code: `onActivate()` and `onDeactivate()`. Enabling your extension calls `onActivate()` and disabling your extension calls `onDeactivate()`. You can initiate custom code by implementing `onActivate()`. Implementing `onDeactivate()` gives you the opportunity to clean up after your extension.
+
+!!! info
+    Disable extensions from the Lens Extensions page:
+
+    1. Navigate to **File** > **Extensions** in the top menu bar. (On Mac, it is **Lens** > **Extensions**.)
+    2. Click **Disable** on the extension you want to disable.
+
+The example above logs messages when the extension is enabled and disabled. 
 
 ### `clusterPages`
 
-Cluster pages appear as part of the cluster dashboard.
-They are accessible from the side bar, and are shown in the menu list after *Custom Resources*.
-It is conventional to use a cluster page to show information or provide functionality pertaining to the active cluster, along with custom data and functionality your extension may have.
-However, it is not limited to the active cluster.
-Also, your extension can gain access to the Kubernetes resources in the active cluster in a straightforward manner using the [`clusterStore`](../stores#clusterstore).
+Cluster pages appear in the cluster dashboard. Use cluster pages to display information about or add functionality to the active cluster. It is also possible to include custom details from other clusters. Use your extension to access Kubernetes resources in the active cluster with [`clusterStore`](../stores#clusterstore).
 
-The following example adds a cluster page definition to a `LensRendererExtension` subclass:
+Add a cluster page definition to a `LensRendererExtension` subclass with the following example:
 
 ``` typescript
 import { LensRendererExtension } from "@k8slens/extensions";
@@ -56,12 +69,13 @@ export default class ExampleExtension extends LensRendererExtension {
 }
 ```
 
-Cluster pages are objects matching the `PageRegistration` interface.
-The `id` field identifies the page, and at its simplest is just a string identifier, as shown in the example above.
-The 'id' field can also convey route path details, such as variable parameters provided to a page ([See example below]()).
-The `components` field matches the `PageComponents` interface for wich there is one field, `Page`.
-`Page` is of type ` React.ComponentType<any>`, which gives you great flexibility in defining the appearance and behaviour of your page.
-For the example above `ExamplePage` can be defined in `page.tsx`:
+`clusterPages` is an array of objects that satisfy the `PageRegistration` interface. The properties of the `clusterPages` array objects are defined as follows:
+
+* `id` is a string that identifies the page.
+* `components` matches the `PageComponents` interface for which there is one field, `Page`.
+* `Page` is of type ` React.ComponentType<any>`. It offers flexibility in defining the appearance and behavior of your page.
+
+`ExamplePage` in the example above can be defined in `page.tsx`:
 
 ``` typescript
 import { LensRendererExtension } from "@k8slens/extensions";
@@ -78,14 +92,15 @@ export class ExamplePage extends React.Component<{ extension: LensRendererExtens
 }
 ```
 
-Note that the `ExamplePage` class defines a property named `extension`.
-This allows the `ExampleExtension` object to be passed in React-style in the cluster page definition, so that `ExamplePage` can access any `ExampleExtension` subclass data.
+Note that the `ExamplePage` class defines the `extension` property. This allows the `ExampleExtension` object to be passed in the cluster page definition in the React style. This way, `ExamplePage` can access all `ExampleExtension` subclass data.
+
+The above example shows how to create a cluster page, but not how to make that page available to the Lens user. Use `clusterPageMenus`, covered in the next section, to add cluster pages to the Lens UI.
 
 ### `clusterPageMenus`
 
-The above example code shows how to create a cluster page but not how to make it available to the Lens user.
-Cluster pages are typically made available through a menu item in the cluster dashboard sidebar.
-Expanding on the above example a cluster page menu is added to the `ExampleExtension` definition:
+`clusterPageMenus` allows you to add cluster page menu items to the secondary left nav.
+
+By expanding on the above example, you can add a cluster page menu item to the `ExampleExtension` definition:
 
 ``` typescript
 import { LensRendererExtension } from "@k8slens/extensions";
@@ -114,14 +129,16 @@ export default class ExampleExtension extends LensRendererExtension {
 }
 ```
 
-Cluster page menus are objects matching the `ClusterPageMenuRegistration` interface.
-They define the appearance of the cluster page menu item in the cluster dashboard sidebar and the behaviour when the cluster page menu item is activated (typically by a mouse click).
-The example above uses the `target` field to set the behaviour as a link to the cluster page with `id` of `"hello"`.
-This is done by setting `target`'s `pageId` field to `"hello"`.
-The cluster page menu item's appearance is defined by setting the `title` field to the text that is to be displayed in the cluster dashboard sidebar.
-The `components` field is used to set an icon that appears to the left of the `title` text in the sidebar.
-Thus when the `"Hello World"` menu item is activated the cluster dashboard will show the contents of `ExamplePage`.
-This example requires the definition of another React-based component, `ExampleIcon`, which has been added to `page.tsx`:
+`clusterPageMenus` is an array of objects that satisfy the `ClusterPageMenuRegistration` interface. This element defines how the cluster page menu item will appear and what it will do when you click it. The properties of the `clusterPageMenus` array objects are defined as follows:
+
+* `target` links to the relevant cluster page using `pageId`.
+* `pageId` takes the value of the relevant cluster page's `id` property.
+* `title` sets the name of the cluster page menu item that will appear in the left side menu. 
+* `components` is used to set an icon that appears to the left of the `title` text in the left side menu.
+
+The above example creates a menu item that reads **Hello World**. When users click **Hello World**, the cluster dashboard will show the contents of `Example Page`.
+
+This example requires the definition of another React-based component, `ExampleIcon`, which has been added to `page.tsx`, as follows:
 
 ``` typescript
 import { LensRendererExtension, Component } from "@k8slens/extensions";
@@ -142,14 +159,13 @@ export class ExamplePage extends React.Component<{ extension: LensRendererExtens
 }
 ```
 
-`ExampleIcon` introduces one of Lens's built-in components available to extension developers, the `Component.Icon`.
-Built in are the [Material Design](https://material.io) [icons](https://material.io/resources/icons/).
-One can be selected by name via the `material` field.
-`ExampleIcon` also sets a tooltip, shown when the Lens user hovers over the icon with a mouse, by setting the `tooltip` field.
+Lens includes various built-in components available for extension developers to use. One of these is the `Component.Icon`, introduced in `ExampleIcon`, which you can use to access any of the [icons](https://material.io/resources/icons/) available at [Material Design](https://material.io). The properties that `Component.Icon` uses are defined as follows:
+
+* `material` takes the name of the icon you want to use.
+* `tooltip` sets the text you want to appear when a user hovers over the icon.
+
+`clusterPageMenus` can also be used to define sub menu items, so that you can create groups of cluster pages. The following example groups two sub menu items under one parent menu item:
 
-A cluster page menu can also be used to define a foldout submenu in the cluster dashboard sidebar.
-This enables the grouping of cluster pages.
-The following example shows how to specify a submenu having two menu items:
 
 ``` typescript
 import { LensRendererExtension } from "@k8slens/extensions";
@@ -200,24 +216,17 @@ export default class ExampleExtension extends LensRendererExtension {
 }
 ```
 
-The above defines two cluster pages and three cluster page menu objects.
-The cluster page definitons are straightforward.
-The first cluster page menu object defines the parent of a foldout submenu.
-Setting the `id` field in a cluster page menu definition implies that it is defining a foldout submenu.
-Also note that the `target` field is not specified (it is ignored if the `id` field is specified).
-This cluster page menu object specifies the `title` and `components` fields, which are used in displaying the menu item in the cluster dashboard sidebar.
-Initially the submenu is hidden.
-Activating this menu item toggles on and off the appearance of the submenu below it.
-The remaining two cluster page menu objects define the contents of the submenu.
-A cluster page menu object is defined to be a submenu item by setting the `parentId` field to the id of the parent of a foldout submenu, `"example"` in this case
+The above defines two cluster pages and three cluster page menu objects. The three cluster page menu objects include one parent menu item and two sub menu items. Parent items require an `id` value, whereas sub items require a `parentId` value. The value of the sub item `parentId` will match the value of the corresponding parent item `id`. Parent items don't require a `target` value. Assign values to the remaining properties as explained above. 
+
+This is what the example will look like, including how the menu item will appear in the secondary left nav:
+
+![clusterPageMenus](images/clusterpagemenus.png)
 
 ### `globalPages`
 
-Global pages appear independently of the cluster dashboard and they fill the Lens UI space.
-A global page is typically triggered from the cluster menu using a [global page menu](#globalpagemenus).
-They can also be triggered by a [custom app menu selection](../main-extension#appmenus) from a Main Extension or a [custom status bar item](#statusbaritems).
-Global pages can appear even when there is no active cluster, unlike cluster pages.
-It is conventional to use a global page to show information and provide functionality relevant across clusters, along with custom data and functionality that your extension may have.
+Global pages are independent of the cluster dashboard and can fill the entire Lens UI. Their primary use is to display information and provide functionality across clusters, including customized data and functionality unique to your extension. 
+
+Typically, you would use a [global page menu](#globalpagemenus) located in the left nav to trigger a global page. You can also trigger a global page with a [custom app menu selection](../main-extension#appmenus) from a Main Extension or a [custom status bar item](#statusbaritems). Unlike cluster pages, users can trigger global pages even when there is no active cluster.
 
 The following example defines a `LensRendererExtension` subclass with a single global page definition:
 
@@ -238,12 +247,13 @@ export default class HelpExtension extends LensRendererExtension {
 }
 ```
 
-Global pages are objects matching the `PageRegistration` interface.
-The `id` field identifies the page, and at its simplest is just a string identifier, as shown in the example above.
-The 'id' field can also convey route path details, such as variable parameters provided to a page ([See example below]()).
-The `components` field matches the `PageComponents` interface for which there is one field, `Page`.
-`Page` is of type ` React.ComponentType<any>`, which gives you great flexibility in defining the appearance and behaviour of your page.
-For the example above `HelpPage` can be defined in `page.tsx`:
+`globalPages` is an array of objects that satisfy the `PageRegistration` interface. The properties of the `globalPages` array objects are defined as follows:
+
+* `id` is a string that identifies the page.
+* `components` matches the `PageComponents` interface for which there is one field, `Page`.
+* `Page` is of type `React.ComponentType<any>`. It offers flexibility in defining the appearance and behavior of your page.
+
+`HelpPage` in the example above can be defined in `page.tsx`:
 
 ``` typescript
 import { LensRendererExtension } from "@k8slens/extensions";
@@ -260,20 +270,19 @@ export class HelpPage extends React.Component<{ extension: LensRendererExtension
 }
 ```
 
-Note that the `HelpPage` class defines a property named `extension`.
-This allows the `HelpExtension` object to be passed in React-style in the global page definition, so that `HelpPage` can access any `HelpExtension` subclass data.
+Note that the `HelpPage` class defines the `extension` property. This allows the `HelpExtension` object to be passed in the global page definition in the React-style. This way, `HelpPage` can access all `HelpExtension` subclass data.
 
-This example code shows how to create a global page but not how to make it available to the Lens user.
-Global pages are typically made available through a number of ways.
-Menu items can be added to the Lens app menu system and set to open a global page when activated (See [`appMenus` in the Main Extension guide](../main-extension#appmenus)).
-Interactive elements can be placed on the status bar (the blue strip along the bottom of the Lens UI) and can be configured to link to a global page when activated (See [`statusBarItems`](#statusbaritems)).
-As well, global pages can be made accessible from the cluster menu, which is the vertical strip along the left side of the Lens UI showing the available cluster icons, and the Add Cluster icon.
-Global page menu icons that are defined using [`globalPageMenus`](#globalpagemenus) appear below the Add Cluster icon.
+This example code shows how to create a global page, but not how to make that page available to the Lens user. Global pages can be made available in the following ways:
+
+* To add global pages to the top menu bar, see [`appMenus`](../main-extension#appmenus) in the Main Extension guide.
+* To add global pages as an interactive element in the blue status bar along the bottom of the Lens UI, see [`statusBarItems`](#statusbaritems).
+* To add global pages to the left side menu, see [`globalPageMenus`](#globalpagemenus).
 
 ### `globalPageMenus`
 
-Global page menus connect a global page to the cluster menu, which is the vertical strip along the left side of the Lens UI showing the available cluster icons, and the Add Cluster icon.
-Expanding on the example from [`globalPages`](#globalPages) a global page menu is added to the `HelpExtension` definition:
+`globalPageMenus` allows you to add global page menu items to the left nav.
+
+By expanding on the above example, you can add a global page menu item to the `HelpExtension` definition:
 
 ``` typescript
 import { LensRendererExtension } from "@k8slens/extensions";
@@ -302,14 +311,16 @@ export default class HelpExtension extends LensRendererExtension {
 }
 ```
 
-Global page menus are objects matching the `PageMenuRegistration` interface.
-They define the appearance of the global page menu item in the cluster menu and the behaviour when the global page menu item is activated (typically by a mouse click).
-The example above uses the `target` field to set the behaviour as a link to the global page with `id` of `"help"`.
-This is done by setting `target`'s `pageId` field to `"help"`.
-The global page menu item's appearance is defined by setting the `title` field to the text that is to be displayed as a tooltip in the cluster menu.
-The `components` field is used to set an icon that appears in the cluster menu.
-Thus when the `"Help"` icon is activated the contents of `ExamplePage` will be shown.
-This example requires the definition of another React-based component, `HelpIcon`, which has been added to `page.tsx`:
+`globalPageMenus` is an array of objects that satisfy the `PageMenuRegistration` interface. This element defines how the global page menu item will appear and what it will do when you click it. The properties of the `globalPageMenus` array objects are defined as follows:
+
+* `target` links to the relevant global page using `pageId`.
+* `pageId` takes the value of the relevant global page's `id` property.
+* `title` sets the name of the global page menu item that will display as a tooltip in the left nav.
+* `components` is used to set an icon that appears in the left nav.
+
+The above example creates a "Help" icon menu item. When users click the icon, the Lens UI will display the contents of `ExamplePage`.
+
+This example requires the definition of another React-based component, `HelpIcon`. Update `page.tsx` from the example above with the `HelpIcon` definition, as follows:
 
 ``` typescript
 import { LensRendererExtension, Component } from "@k8slens/extensions";
@@ -330,14 +341,21 @@ export class HelpPage extends React.Component<{ extension: LensRendererExtension
 }
 ```
 
-`HelpIcon` introduces one of Lens's built-in components available to extension developers, the `Component.Icon`.
-Built in are the [Material Design](https://material.io) [icons](https://material.io/resources/icons/).
-One can be selected by name via the `material` field.
+Lens includes various built-in components available for extension developers to use. One of these is the `Component.Icon`, introduced in `HelpIcon`, which you can use to access any of the [icons](https://material.io/resources/icons/) available at [Material Design](https://material.io). The property that `Component.Icon` uses is defined as follows:
+
+* `material` takes the name of the icon you want to use.
+
+This is what the example will look like, including how the menu item will appear in the left nav:
+
+![globalPageMenus](images/globalpagemenus.png)
 
 ### `clusterFeatures`
 
 Cluster features are Kubernetes resources that can be applied to and managed within the active cluster.
-They can be installed/uninstalled by the Lens user from the [cluster settings page]().
+They can be installed and uninstalled by the Lens user from the cluster **Settings** page.
+
+!!! info
+    To access the cluster **Settings** page, right-click the relevant cluster in the left side menu and click **Settings**.
 
 The following example shows how to add a cluster feature as part of a `LensRendererExtension`:
 
@@ -364,8 +382,11 @@ export default class ExampleFeatureExtension extends LensRendererExtension {
   ];
 }
 ```
-The `title` and `components.Description` fields provide content that appears on the cluster settings page, in the **Features** section.
-The `feature` field must specify an instance which extends the abstract class `ClusterFeature.Feature`, and specifically implement the following methods:
+
+The properties of the `clusterFeatures` array objects are defined as follows:
+
+* `title` and `components.Description` provide content that appears on the cluster settings page, in the **Features** section.
+* `feature` specifies an instance which extends the abstract class `ClusterFeature.Feature`, and specifically implements the following methods:
 
 ``` typescript
   abstract install(cluster: Cluster): Promise<void>;
@@ -374,20 +395,21 @@ The `feature` field must specify an instance which extends the abstract class `C
   abstract updateStatus(cluster: Cluster): Promise<ClusterFeatureStatus>;
 ```
 
-The `install()` method is typically called by Lens when a user has indicated that this feature is to be installed (i.e. clicked **Install** for the feature on the cluster settings page).
-The implementation of this method should install kubernetes resources using the `applyResources()` method, or by directly accessing the kubernetes api ([`K8sApi`](tbd)).
+The four methods listed above are defined as follows:
 
-The `upgrade()` method is typically called by Lens when a user has indicated that this feature is to be upgraded (i.e. clicked **Upgrade** for the feature on the cluster settings page).
-The implementation of this method should upgrade the kubernetes resources already installed, if relevant to the feature.
+* The `install()` method installs Kubernetes resources using the `applyResources()` method, or by directly accessing the [Kubernetes API](../api/README.md). This method is typically called when a user indicates that they want to install the feature (i.e., by clicking **Install** for the feature in the cluster settings page).
 
-The `uninstall()` method is typically called by Lens when a user has indicated that this feature is to be uninstalled (i.e. clicked **Uninstall** for the feature on the cluster settings page).
-The implementation of this method should uninstall kubernetes resources using the kubernetes api (`K8sApi`)
+* The `upgrade()` method upgrades the Kubernetes resources already installed, if they are relevant to the feature. This method is typically called when a user indicates that they want to upgrade the feature (i.e., by clicking **Upgrade** for the feature in the cluster settings page).
 
-The `updateStatus()` method is called periodically by Lens to determine details about the feature's current status.
-The implementation of this method should provide the current status information in the `status` field of the `ClusterFeature.Feature` parent class.
-The `status.currentVersion` and `status.latestVersion` fields may be displayed by Lens in describing the feature.
-The `status.installed` field should be set to true if the feature is currently installed, otherwise false.
-Also, Lens relies on the `status.canUpgrade` field to determine if the feature can be upgraded (i.e a new version could be available) so the implementation should set the `status.canUpgrade` field according to specific rules for the feature, if relevant.
+* The `uninstall()` method uninstalls Kubernetes resources using the [Kubernetes API](../api/README.md). This method is typically called when a user indicates that they want to uninstall the feature (i.e., by clicking **Uninstall** for the feature in the cluster settings page).
+
+* The `updateStatus()` method provides the current status information in the `status` field of the `ClusterFeature.Feature` parent class. Lens periodically calls this method to determine details about the feature's current status. Consider using the following properties with `updateStatus()`:
+
+    * `status.currentVersion` and `status.latestVersion` may be displayed by Lens in the feature's description.
+
+    * `status.installed` should be set to `true` if the feature is installed, and `false` otherwise.
+
+    * `status.canUpgrade` is set according to a rule meant to determine whether the feature can be upgraded. This rule can involve `status.currentVersion` and `status.latestVersion`, if desired.
 
 The following shows a very simple implementation of a `ClusterFeature`:
 
@@ -435,9 +457,9 @@ export class ExampleFeature extends ClusterFeature.Feature {
 }
 ```
 
-This example implements the `install()` method by simply invoking the helper `applyResources()` method.
+This example implements the `install()` method by invoking the helper `applyResources()` method.
 `applyResources()` tries to apply all resources read from all files found in the folder path provided.
-In this case this folder path is the `../resources` subfolder relative to current source code's folder.
+In this case the folder path is the `../resources` subfolder relative to the current source code's folder.
 The file `../resources/example-pod.yml` could contain:
 
 ``` yaml
@@ -451,18 +473,18 @@ spec:
     image: nginx
 ```
 
-The `upgrade()` method in the example above is implemented by simply invoking the `install()` method.
-Depending on the feature to be supported by an extension, upgrading may require additional and/or different steps.
+The example above implements the four methods as follows:
 
-The `uninstall()` method is implemented in the example above by utilizing the [`K8sApi`](tbd) provided by Lens to simply delete the `example-pod` pod applied by the `install()` method.
+* It implements `upgrade()` by invoking the `install()` method. Depending on the feature to be supported by an extension, upgrading may require additional and/or different steps.
 
-The `updateStatus()` method is implemented above by using the [`K8sApi`](tbd) as well, this time to get information from the `example-pod` pod, in particular to determine if it is installed, what version is associated with it, and if it can be upgraded.
-How the status is updated for a specific cluster feature is up to the implementation.
+* It implements `uninstall()` by utilizing the [Kubernetes API](../api/README.md) which Lens provides to delete the `example-pod` applied by the `install()` method.
+
+* It implements `updateStatus()` by using the [Kubernetes API](../api/README.md) which Lens provides to determine whether the `example-pod` is installed, what version is associated with it, and whether it can be upgraded. The implementation determines what the status is for a specific cluster feature.
 
 ### `appPreferences`
 
-The Preferences page is a built-in global page.
-Extensions can add custom preferences to the Preferences page, thus providing a single location for users to configure global options, for Lens and extensions alike.
+The Lens **Preferences** page is a built-in global page. You can use Lens extensions to add custom preferences to the Preferences page, providing a single location for users to configure global options.
+
 The following example demonstrates adding a custom preference:
 
 ``` typescript
@@ -487,13 +509,20 @@ export default class ExampleRendererExtension extends LensRendererExtension {
 }
 ```
 
-App preferences are objects matching the `AppPreferenceRegistration` interface.
-The `title` field specifies the text to show as the heading on the Preferences page.
-The `components` field specifies two `React.Component` objects defining the interface for the preference.
-`Input` should specify an interactive input element for your preference and `Hint` should provide descriptive information for the preference, which is shown below the `Input` element.
-`ExamplePreferenceInput` expects its React props set to an `ExamplePreferenceProps` instance, which is how `ExampleRendererExtension` handles the state of the preference input.
-`ExampleRendererExtension` has the field `preference`, which is provided to `ExamplePreferenceInput` when it is created.
-In this example `ExamplePreferenceInput`, `ExamplePreferenceHint`, and `ExamplePreferenceProps` are defined in `./src/example-preference.tsx`:
+`appPreferences` is an array of objects that satisfies the `AppPreferenceRegistration` interface. The properties of the `appPreferences` array objects are defined as follows:
+
+* `title` sets the heading text displayed on the Preferences page.
+* `components` specifies two `React.Component` objects that define the interface for the preference.
+    * `Input` specifies an interactive input element for the preference. 
+    * `Hint` provides descriptive information for the preference, shown below the `Input` element.
+
+!!! note
+    Note that the input and the hint can be comprised of more sophisticated elements, according to the needs of the extension.
+
+`ExamplePreferenceInput` expects its React props to be set to an `ExamplePreferenceProps` instance. This is how `ExampleRendererExtension` handles the state of the preference input.
+`ExampleRendererExtension` has a `preference` field, which you will add to `ExamplePreferenceInput`.
+
+In this example `ExamplePreferenceInput`, `ExamplePreferenceHint`, and `ExamplePreferenceProps` are defined in `./src/example-preference.tsx` as follows:
 
 ``` typescript
 import { Component } from "@k8slens/extensions";
@@ -530,28 +559,26 @@ export class ExamplePreferenceHint extends React.Component {
 }
 ```
 
-`ExamplePreferenceInput` implements a simple checkbox (using Lens's `Component.Checkbox`).
-It provides `label` as the text to display next to the checkbox and an `onChange` function, which reacts to the checkbox state change.
-The checkbox's `value` is initially set to `preference.enabled`.
-`ExamplePreferenceInput` is defined with React props of `ExamplePreferenceProps` type, which is an object with a single field, `enabled`.
-This is used to indicate the state of the preference, and is bound to the checkbox state in `onChange`.
+`ExamplePreferenceInput` implements a simple checkbox using Lens's `Component.Checkbox` using the following properties:
+
+* `label` sets the text that displays next to the checkbox.
+* `value` is initially set to `preference.enabled`.
+* `onChange` is a function that responds when the state of the checkbox changes.
+
+`ExamplePreferenceInput` is defined with the `ExamplePreferenceProps` React props. This is an object with the single `enabled` property. It is used to indicate the state of the preference, and it is bound to the checkbox state in `onChange`.
+
 `ExamplePreferenceHint` is a simple text span.
-Note that the input and the hint could comprise of more sophisticated elements, according to the needs of the extension.
 
-Note that the above example introduces decorators `observable` and `observer` from the [`mobx`](https://mobx.js.org/README.html) and [`mobx-react`](https://github.com/mobxjs/mobx-react#mobx-react) packages.
-`mobx` simplifies state management and without it this example would not visually update the checkbox properly when the user activates it.
-[Lens uses `mobx` extensively for state management](../working-with-mobx) of its own UI elements and it is recommended that extensions rely on it too.
-Alternatively, React's state management can be used, though `mobx` is typically simpler to use.
+The above example introduces the decorators `observable` and `observer` from the [`mobx`](https://mobx.js.org/README.html) and [`mobx-react`](https://github.com/mobxjs/mobx-react#mobx-react) packages. `mobx` simplifies state management. Without it, this example would not visually update the checkbox properly when the user activates it. [Lens uses `mobx`](../working-with-mobx) extensively for state management of its own UI elements. We recommend that extensions rely on it, as well.
+Alternatively, you can use React's state management, though `mobx` is typically simpler to use.
 
-Also note that an extension's state data can be managed using an `ExtensionStore` object, which conveniently handles persistence and synchronization.
-The example above defined a `preference` field in the `ExampleRendererExtension` class definition to hold the extension's state primarily to simplify the code for this guide, but it is recommended to manage your extension's state data using [`ExtensionStore`](../stores#extensionstore)
+Note that you can manage an extension's state data using an `ExtensionStore` object, which conveniently handles persistence and synchronization. To simplify this guide, the example above defines a `preference` field in the `ExampleRendererExtension` class definition to hold the extension's state. However, we recommend that you manage your extension's state data using [`ExtensionStore`](../stores#extensionstore).
 
 ### `statusBarItems`
 
-The Status bar is the blue strip along the bottom of the Lens UI.
-Status bar items are `React.ReactNode` types, which can be used to convey status information, or act as a link to a global page, or even an external page.
+The status bar is the blue strip along the bottom of the Lens UI. `statusBarItems` are `React.ReactNode` types. They can be used to display status information, or act as links to global pages as well as external pages.
 
-The following example adds a status bar item definition, as well as a global page definition, to a `LensRendererExtension` subclass, and configures the status bar item to navigate to the global page upon activation (normally a mouse click):
+The following example adds a `statusBarItems` definition and a `globalPages` definition to a `LensRendererExtension` subclass. It configures the status bar item to navigate to the global page upon activation (normally a mouse click):
 
 ``` typescript
 import { LensRendererExtension } from '@k8slens/extensions';
@@ -584,23 +611,23 @@ export default class HelpExtension extends LensRendererExtension {
 }
 ```
 
-The `item` field of a status bar item specifies the `React.Component` to be shown on the status bar.
-By default items are added starting from the right side of the status bar.
-Typically, `item` would specify an icon and/or a short string of text, considering the limited space on the status bar.
-In the example above the `HelpIcon` from the [`globalPageMenus` guide](#globalpagemenus) is reused.
-Also, the `item` provides a link to the global page by setting the `onClick` property to a function that calls the `LensRendererExtension` `navigate()` method.
-`navigate()` takes as a parameter the id of the global page, which is shown when `navigate()` is called.
+The properties of the `statusBarItems` array objects are defined as follows:
+
+* `item` specifies the `React.Component` that will be shown on the status bar. By default, items are added starting from the right side of the status bar. Due to limited space in the status bar, `item` will typically specify only an icon or a short string of text. The example above reuses the `HelpIcon` from the [`globalPageMenus` guide](#globalpagemenus). 
+* `onClick` determines what the `statusBarItem` does when it is clicked. In the example, `onClick` is set to a function that calls the `LensRendererExtension` `navigate()` method. `navigate` takes the `id` of the associated global page as a parameter. Thus, clicking the status bar item activates the associated global pages.
 
 ### `kubeObjectMenuItems`
 
-An extension can add custom menu items (including actions) for specific Kubernetes resource kinds/apiVersions.
-These menu items appear under the `...` for each listed resource in the cluster dashboard, and on the title bar of the details page for a specific resource:
+An extension can add custom menu items (`kubeObjectMenuItems`) for specific Kubernetes resource kinds and apiVersions.
+`kubeObjectMenuItems` appear under the vertical ellipsis for each listed resource in the cluster dashboard:
 
 ![List](images/kubeobjectmenuitem.png)
 
+They also appear on the title bar of the details page for specific resources:
+
 ![Details](images/kubeobjectmenuitemdetail.png)
 
-The following example shows how to add a menu for Namespace resources, and associate an action with it:
+The following example shows how to add a `kubeObjectMenuItems` for namespace resources with an associated action:
 
 ``` typescript
 import React from "react"
@@ -621,12 +648,13 @@ export default class ExampleExtension extends LensRendererExtension {
 
 ```
 
-Kube object menu items are objects matching the `KubeObjectMenuRegistration` interface.
-The `kind` field specifies the kubernetes resource type to apply this menu item to, and the `apiVersion` field specifies the kubernetes api to use in relation to this resource type.
-This example adds a menu item for namespaces in the cluster dashboard.
-The `components` field defines the menu item's appearance and behaviour.
-The `MenuItem` field provides a function that returns a `React.Component` given a set of menu item properties.
-In this example a `NamespaceMenuItem` object is returned.
+`kubeObjectMenuItems` is an array of objects matching the `KubeObjectMenuRegistration` interface. The example above adds a menu item for namespaces in the cluster dashboard. The properties of the `kubeObjectMenuItems` array objects are defined as follows:
+
+* `kind` specifies the Kubernetes resource type the menu item will apply to. 
+* `apiVersion` specifies the Kubernetes API version number to use with the resource type.
+* `components` defines the menu item's appearance and behavior.
+* `MenuItem` provides a function that returns a `React.Component` given a set of menu item properties. In this example a `NamespaceMenuItem` object is returned.
+
 `NamespaceMenuItem` is defined in `./src/namespace-menu-item.tsx`:
 
 ```typescript
@@ -661,22 +689,18 @@ export function NamespaceMenuItem(props: Component.KubeObjectMenuProps<K8sApi.Na
 
 ```
 
-`NamespaceMenuItem` returns a `Component.MenuItem` defining the menu item's appearance (icon and text) and behaviour when activated via the `onClick` property.
-`getPods()` shows how to open a terminal tab and run a command, specifically it runs `kubectl` to get a list of pods running in the current namespace.
-See [`Component.terminalStore.sendCommand`](api-docs?) for more details on running terminal commands.
-The name of the namespace is retrieved from `props` passed into `NamespaceMenuItem()`.
-`namespace` is the `props.object`, which is of type `K8sApi.Namespace`.
-This is the api for accessing namespaces, and the current namespace in this example is simply given by `namespace.getName()`.
-Thus kube object menu items are afforded convenient access to the specific resource selected by the user.
+`NamespaceMenuItem` returns a `Component.MenuItem` which defines the menu item's appearance and its behavior when activated via the `onClick` property. In the example, `getPods()` opens a terminal tab and runs `kubectl` to get a list of pods running in the current namespace.
+
+The name of the namespace is retrieved from `props` passed into `NamespaceMenuItem()`. `namespace` is the `props.object`, which is of type `K8sApi.Namespace`. `K8sApi.Namespace` is the API for accessing namespaces. The current namespace in this example is simply given by `namespace.getName()`. Thus, `kubeObjectMenuItems` afford convenient access to the specific resource selected by the user.
 
 ### `kubeObjectDetailItems`
 
-An extension can add custom details (content) for specified Kubernetes resource kinds/apiVersions.
-These custom details appear on the details page for a specific resource, such as a Namespace:
+An extension can add custom details (`kubeObjectDetailItems`) for specified Kubernetes resource kinds and apiVersions.
+These custom details appear on the details page for a specific resource, such as a Namespace as shown here:
 
 ![Details](images/kubeobjectdetailitem.png)
 
-The following example shows how to add a tabulated list of pods to the Namespace resource details page:
+The following example shows how to use `kubeObjectDetailItems` to add a tabulated list of pods to the Namespace resource details page:
 
 ``` typescript
 import React from "react"
@@ -697,12 +721,13 @@ export default class ExampleExtension extends LensRendererExtension {
 }
 ```
 
-Kube object detail items are objects matching the `KubeObjectDetailRegistration` interface.
-The `kind` field specifies the kubernetes resource type to apply this detail item to, and the `apiVersion` field specifies the kubernetes api to use in relation to this resource type.
-This example adds a detail item for namespaces in the cluster dashboard.
-The `components` field defines the detail item's appearance and behaviour.
-The `Details` field provides a function that returns a `React.Component` given a set of detail item properties.
-In this example a `NamespaceDetailsItem` object is returned.
+`kubeObjectDetailItems` is an array of objects matching the `KubeObjectDetailRegistration` interface. This example above adds a detail item for namespaces in the cluster dashboard. The properties of the `kubeObjectDetailItems` array objects are defined as follows:
+
+* `kind` specifies the Kubernetes resource type the detail item will apply to.
+* `apiVersion` specifies the Kubernetes API version number to use with the resource type.
+* `components` defines the detail item's appearance and behavior.
+* `Details` provides a function that returns a `React.Component` given a set of detail item properties. In this example a `NamespaceDetailsItem` object is returned.
+
 `NamespaceDetailsItem` is defined in `./src/namespace-details-item.tsx`:
 
 ``` typescript
@@ -732,21 +757,11 @@ export class NamespaceDetailsItem extends React.Component<Component.KubeObjectDe
 }
 ```
 
-Since `NamespaceDetailsItem` extends `React.Component<Component.KubeObjectDetailsProps<K8sApi.Namespace>>` it can access the current namespace object (type `K8sApi.Namespace`) through `this.props.object`.
-This object can be queried for many details about the current namespace.
-In this example the namespace's name is obtained in `componentDidMount()` using the `K8sApi.Namespace` `getName()` method.
-The namespace's name is needed to limit the list of pods to only those in this namespace.
-To get the list of pods this example uses the kubernetes pods api, specifically the `K8sApi.podsApi.list()` method.
-The `K8sApi.podsApi` is automatically configured for the currently active cluster.
+Since `NamespaceDetailsItem` extends `React.Component<Component.KubeObjectDetailsProps<K8sApi.Namespace>>`, it can access the current namespace object (type `K8sApi.Namespace`) through `this.props.object`. You can query this object for many details about the current namespace. In the example above, `componentDidMount()` gets the namespace's name using the `K8sApi.Namespace` `getName()` method. Use the namespace's name to limit the list of pods only to those in the relevant namespace. To get this list of pods, this example uses the Kubernetes pods API `K8sApi.podsApi.list()` method. The `K8sApi.podsApi` is automatically configured for the active cluster.
 
-Note that `K8sApi.podsApi.list()` is an asynchronous method, and ideally getting the pods list should be done before rendering the `NamespaceDetailsItem`.
-It is a common technique in React development to await async calls in `componentDidMount()`.
-However, `componentDidMount()` is called right after the first call to `render()`.
-In order to effect a subsequent `render()` call React must be made aware of a state change.
-Like in the [`appPreferences` guide](#apppreferences), [`mobx`](https://mobx.js.org/README.html) and [`mobx-react`](https://github.com/mobxjs/mobx-react#mobx-react) are used to ensure `NamespaceDetailsItem` renders when the pods list is updated.
-This is done simply by marking the `pods` field as an `observable` and the `NamespaceDetailsItem` class itself as an `observer`.
+Note that `K8sApi.podsApi.list()` is an asynchronous method. Getting the pods list should occur prior to rendering the `NamespaceDetailsItem`. It is a common technique in React development to await async calls in `componentDidMount()`. However, `componentDidMount()` is called right after the first call to `render()`. In order to effect a subsequent `render()` call, React must be made aware of a state change. Like in the [`appPreferences` guide](#apppreferences), [`mobx`](https://mobx.js.org/README.html) and [`mobx-react`](https://github.com/mobxjs/mobx-react#mobx-react) are used to ensure `NamespaceDetailsItem` renders when the pods list updates. This is done simply by marking the `pods` field as an `observable` and the `NamespaceDetailsItem` class itself as an `observer`.
 
-Finally, the `NamespaceDetailsItem` is rendered using the `render()` method.
+Finally, the `NamespaceDetailsItem` renders using the `render()` method.
 Details are placed in drawers, and using `Component.DrawerTitle` provides a separator from details above this one.
 Multiple details in a drawer can be placed in `<Component.DrawerItem>` elements for further separation, if desired.
 The rest of this example's details are defined in `PodsDetailsList`, found in `./pods-details-list.tsx`:
@@ -800,6 +815,9 @@ export class PodsDetailsList extends React.Component<Props> {
 
 ![DetailsWithPods](images/kubeobjectdetailitemwithpods.png)
 
- For each pod the name, age, and status are obtained using the `K8sApi.Pod` methods.
+Obtain the name, age, and status for each pod using the `K8sApi.Pod` methods. Construct the table using the `Component.Table` and related elements.
+
+
+For each pod the name, age, and status are obtained using the `K8sApi.Pod` methods.
 The table is constructed using the `Component.Table` and related elements.
-See [`Component` documentation](url?) for further details.
\ No newline at end of file
+See [`Component` documentation](https://docs.k8slens.dev/master/extensions/api/modules/_renderer_api_components_/) for further details.
\ No newline at end of file
diff --git a/docs/extensions/guides/stores.md b/docs/extensions/guides/stores.md
index 981a7cda3e..0319ee0aab 100644
--- a/docs/extensions/guides/stores.md
+++ b/docs/extensions/guides/stores.md
@@ -1,18 +1,16 @@
 # Stores
 
-Stores are components that persist and synchronize state data. Lens utilizes a number of stores for maintaining a variety of state information.
-A few of these are exposed by the extensions api for use by the extension developer.
+Stores are components that persist and synchronize state data. Lens uses a number of stores to maintain various kinds of state information, including:
 
-- The `ClusterStore` manages cluster state data such as cluster details, and which cluster is active.
-- The `WorkspaceStore` similarly manages workspace state data, such as workspace name, and which clusters belong to a given workspace.
-- The `ExtensionStore` is a store for managing custom extension state data.
+* The `ClusterStore` manages cluster state data (such as cluster details), and it tracks which cluster is active.
+* The `WorkspaceStore` manages workspace state data (such as the workspace name), and and it tracks which clusters belong to a given workspace.
+* The `ExtensionStore` manages custom extension state data.
+
+This guide focuses on the `ExtensionStore`.
 
 ## ExtensionStore
 
-Extension developers can create their own store for managing state data by extending the `ExtensionStore` class.
-This guide shows how to create a store for the [`appPreferences` guide example](../renderer-extension#apppreferences), which demonstrates how to add a custom preference to the Preferences page.
-The preference is a simple boolean that indicates whether something is enabled or not.
-The problem with that example is that the enabled state is not stored anywhere, and reverts to the default the next time Lens is started.
+Extension developers can create their own store for managing state data by extending the `ExtensionStore` class. This guide shows how to create a store for the [`appPreferences`](../renderer-extension#apppreferences) guide example, which demonstrates how to add a custom preference to the **Preferences** page. The preference is a simple boolean that indicates whether or not something is enabled. However, in the example, the enabled state is not stored anywhere, and it reverts to the default when Lens is restarted.
 
 The following example code creates a store for the `appPreferences` guide example:
 
@@ -53,25 +51,14 @@ export class ExamplePreferencesStore extends Store.ExtensionStore<ExamplePrefere
 export const examplePreferencesStore = ExamplePreferencesStore.getInstance<ExamplePreferencesStore>();
 ```
 
-First the extension's data model is defined using a simple type, `ExamplePreferencesModel`, which has a single field, `enabled`, representing the preference's state.
-`ExamplePreferencesStore` extends `Store.ExtensionStore`, based on the `ExamplePreferencesModel`.
-The field `enabled` is added to the `ExamplePreferencesStore` class to hold the "live" or current state of the preference.
-Note the use of the `observer` decorator on the `enabled` field.
-As for the [`appPreferences` guide example](../renderer-extension#apppreferences), [`mobx`](https://mobx.js.org/README.html) is used for the UI state management, ensuring the checkbox updates when activated by the user.
+First, our example defines the extension's data model using the simple `ExamplePreferencesModel` type. This has a single field, `enabled`, which represents the preference's state. `ExamplePreferencesStore` extends `Store.ExtensionStore`, which is based on the `ExamplePreferencesModel`. The `enabled` field is added to the `ExamplePreferencesStore` class to hold the "live" or current state of the preference. Note the use of the `observable` decorator on the `enabled` field. The [`appPreferences`](../renderer-extension#apppreferences) guide example uses [MobX](https://mobx.js.org/README.html) for the UI state management, ensuring the checkbox updates when it's activated by the user.
 
-Then the constructor and two abstract methods are implemented.
-In the constructor, the name of the store (`"example-preferences-store"`), and the default (initial) value for the preference state (`enabled: false`) are specified. 
-The `fromStore()` method is called by Lens internals when the store is loaded, and gives the extension the opportunity to retrieve the stored state data values based on the defined data model.
-Here, the `enabled` field of the `ExamplePreferencesStore` is set to the value from the store whenever `fromStore()` is invoked.
-The `toJSON()` method is complementary to `fromStore()`, and is called when the store is being saved.
-`toJSON()` must provide a JSON serializable object, facilitating its storage in JSON format.
-The `toJS()` function from [`mobx`](https://mobx.js.org/README.html) is convenient for this purpose, and is used here.
+Next, our example implements the constructor and two abstract methods. The constructor specifies the name of the store (`"example-preferences-store"`) and the default (initial) value for the preference state (`enabled: false`). Lens internals call the `fromStore()` method when the store loads. It gives the extension the opportunity to retrieve the stored state data values based on the defined data model. The `enabled` field of the `ExamplePreferencesStore` is set to the value from the store whenever `fromStore()` is invoked. The `toJSON()` method is complementary to `fromStore()`. It is called when the store is being saved.
+`toJSON()` must provide a JSON serializable object, facilitating its storage in JSON format. The `toJS()` function from [`mobx`](https://mobx.js.org/README.html) is convenient for this purpose, and is used here.
 
-Finally, `examplePreferencesStore` is created by calling `ExamplePreferencesStore.getInstance<ExamplePreferencesStore>()`, and exported for use by other parts of the extension.
-Note that `examplePreferencesStore` is a singleton, calling this function again will not create a new store.
+Finally, `examplePreferencesStore` is created by calling `ExamplePreferencesStore.getInstance<ExamplePreferencesStore>()`, and exported for use by other parts of the extension. Note that `examplePreferencesStore` is a singleton. Calling this function again will not create a new store.
 
-The following example code, modified from the [`appPreferences` guide example](../renderer-extension#apppreferences) demonstrates how to use the extension store.
-`examplePreferencesStore` must be loaded in the main process, where loaded stores are automatically saved when exiting Lens. This can be done in `./main.ts`:
+The following example code, modified from the [`appPreferences`](../renderer-extension#apppreferences) guide demonstrates how to use the extension store. `examplePreferencesStore` must be loaded in the main process, where loaded stores are automatically saved when exiting Lens. This can be done in `./main.ts`:
 
 ``` typescript
 import { LensMainExtension } from "@k8slens/extensions";
@@ -84,8 +71,8 @@ export default class ExampleMainExtension extends LensMainExtension {
 }
 ```
 
-Here, `examplePreferencesStore` is loaded with `examplePreferencesStore.loadExtension(this)`, which is conveniently called from the `onActivate()` method of `ExampleMainExtension`.
-Similarly, `examplePreferencesStore` must be loaded in the renderer process where the `appPreferences` are handled. This can be done in `./renderer.ts`:
+Here, `examplePreferencesStore` loads with `examplePreferencesStore.loadExtension(this)`, which is conveniently called from the `onActivate()` method of `ExampleMainExtension`.
+Similarly, `examplePreferencesStore` must load in the renderer process where the `appPreferences` are handled. This can be done in `./renderer.ts`:
 
 ``` typescript
 import { LensRendererExtension } from "@k8slens/extensions";
@@ -111,8 +98,7 @@ export default class ExampleRendererExtension extends LensRendererExtension {
 }
 ```
 
-Again, `examplePreferencesStore.loadExtension(this)` is called to load `examplePreferencesStore`, this time from the `onActivate()` method of `ExampleRendererExtension`.
-Also, there is no longer the need for the `preference` field in the `ExampleRendererExtension` class, as the props for `ExamplePreferenceInput` is now `examplePreferencesStore`.
+Again, `examplePreferencesStore.loadExtension(this)` is called to load `examplePreferencesStore`, this time from the `onActivate()` method of `ExampleRendererExtension`. There is no longer the need for the `preference` field in the `ExampleRendererExtension` class because the props for `ExamplePreferenceInput` is now `examplePreferencesStore`.
 `ExamplePreferenceInput` is defined in `./src/example-preference.tsx`:
 
 ``` typescript
@@ -151,5 +137,5 @@ export class ExamplePreferenceHint extends React.Component {
 ```
 
 The only change here is that `ExamplePreferenceProps` defines its `preference` field as an `ExamplePreferencesStore` type.
-Everything else works as before except now the `enabled` state persists across Lens restarts because it is managed by the 
+Everything else works as before, except that now the `enabled` state persists across Lens restarts because it is managed by the 
 `examplePreferencesStore`.
\ No newline at end of file
diff --git a/docs/extensions/guides/working-with-mobx.md b/docs/extensions/guides/working-with-mobx.md
index 5577ff6bdc..41ddc487a6 100644
--- a/docs/extensions/guides/working-with-mobx.md
+++ b/docs/extensions/guides/working-with-mobx.md
@@ -1,23 +1,26 @@
-# Working with mobx
+# Working with MobX
 
 ## Introduction
 
-Lens uses `mobx` as its state manager on top of React's state management system.
-This helps with having a more declarative style of managing state, as opposed to `React`'s native `setState` mechanism.
-You should already have a basic understanding of how `React` handles state ([read here](https://reactjs.org/docs/faq-state.html) for more information).
-However, if you do not, here is a quick overview.
+Lens uses MobX on top of React's state management system.
+The result is a more declarative state management style, rather than React's native `setState` mechanism.
 
-- A `React.Component` is generic over both `Props` and `State` (with default empty object types).
-- `Props` should be considered read-only from the point of view of the component and is the mechanism for passing in "arguments" to a component.
-- `State` is a component's internal state and can be read by accessing the parent field `state`.
-- `State` **must** be updated using the `setState` parent method which merges the new data with the old state.
-- `React` does do some optimizations around re-rendering components after quick successions of `setState` calls.
+You can review how React handles state management [here](https://reactjs.org/docs/faq-state.html).
 
-## How mobx works:
+The following is a quick overview:
 
-`mobx` is a package that provides an abstraction over `React`'s state management. The three main concepts are:
-- `observable`: data stored in the component's `state`
-- `action`: a function that modifies any `observable` data
-- `computed`: data that is derived from `observable` data but is not actually stored. Think of this as computing `isEmpty` vs an `observable` field called `count`.
+* `React.Component` is generic with respect to both `props` and `state` (which default to the empty object type).
+* `props` should be considered read-only from the point of view of the component, and it is the mechanism for passing in arguments to a component.
+* `state` is a component's internal state, and can be read by accessing the super-class field `state`.
+* `state` **must** be updated using the `setState` parent method which merges the new data with the old state.
+* React does some optimizations around re-rendering components after quick successions of `setState` calls.
 
-Further reading is available from `mobx`'s [website](https://mobx.js.org/the-gist-of-mobx.html).
+## How MobX Works:
+
+MobX is a package that provides an abstraction over React's state management system. The three main concepts are:
+
+* `observable` is a marker for data stored in the component's `state`.
+* `action` is a function that modifies any `observable` data.
+* `computed` is a marker for data that is derived from `observable` data, but that is not actually stored. Think of this as computing `isEmpty` rather than an observable field called `count`.
+
+Further reading is available on the [MobX website](https://mobx.js.org/the-gist-of-mobx.html).
diff --git a/integration/__tests__/app.tests.ts b/integration/__tests__/app.tests.ts
index 410712e4f0..c986e4804e 100644
--- a/integration/__tests__/app.tests.ts
+++ b/integration/__tests__/app.tests.ts
@@ -5,8 +5,11 @@
   cluster and vice versa.
 */
 import { Application } from "spectron";
-import * as util from "../helpers/utils";
-import { spawnSync } from "child_process";
+import * as utils from "../helpers/utils";
+import { spawnSync, exec } from "child_process";
+import * as util from "util";
+
+export const promiseExec = util.promisify(exec);
 
 jest.setTimeout(60000);
 
@@ -16,7 +19,7 @@ describe("Lens integration tests", () => {
   const BACKSPACE = "\uE003";
   let app: Application;
   const appStart = async () => {
-    app = util.setup();
+    app = utils.setup();
     await app.start();
     // Wait for splash screen to be closed
     while (await app.client.getWindowCount() > 1);
@@ -71,7 +74,7 @@ describe("Lens integration tests", () => {
 
     afterAll(async () => {
       if (app?.isRunning()) {
-        await util.tearDown(app);
+        await utils.tearDown(app);
       }
     });
 
@@ -93,7 +96,10 @@ describe("Lens integration tests", () => {
       });
 
       it("ensures helm repos", async () => {
-        await app.client.waitUntilTextExists("div.repos #message-bitnami", "bitnami"); // wait for the helm-cli to fetch the bitnami repo
+        const { stdout: reposJson } = await promiseExec("helm repo list -o json");
+        const repos = JSON.parse(reposJson);
+
+        await app.client.waitUntilTextExists("div.repos #message-bitnami", repos[0].name); // wait for the helm-cli to fetch the repo(s)
         await app.client.click("#HelmRepoSelect"); // click the repo select to activate the drop-down
         await app.client.waitUntilTextExists("div.Select__option", "");  // wait for at least one option to appear (any text)
       });
@@ -105,12 +111,12 @@ describe("Lens integration tests", () => {
     });
   });
 
-  util.describeIf(ready)("workspaces", () => {
+  utils.describeIf(ready)("workspaces", () => {
     beforeAll(appStart, 20000);
 
     afterAll(async () => {
       if (app && app.isRunning()) {
-        return util.tearDown(app);
+        return utils.tearDown(app);
       }
     });
 
@@ -169,7 +175,7 @@ describe("Lens integration tests", () => {
     await app.client.waitUntilTextExists("span.link-text", "Cluster");
   };
 
-  util.describeIf(ready)("cluster tests", () => {
+  utils.describeIf(ready)("cluster tests", () => {
     let clusterAdded = false;
     const addCluster = async () => {
       await clickWhatsNew(app);
@@ -184,7 +190,7 @@ describe("Lens integration tests", () => {
 
       afterAll(async () => {
         if (app && app.isRunning()) {
-          return util.tearDown(app);
+          return utils.tearDown(app);
         }
       });
 
@@ -207,7 +213,7 @@ describe("Lens integration tests", () => {
 
       afterAll(async () => {
         if (app && app.isRunning()) {
-          return util.tearDown(app);
+          return utils.tearDown(app);
         }
       });
 
@@ -313,6 +319,12 @@ describe("Lens integration tests", () => {
           expectedSelector: "h5.title",
           expectedText: "Resource Quotas"
         },
+        {
+          name: "Limit Ranges",
+          href: "limitranges",
+          expectedSelector: "h5.title",
+          expectedText: "Limit Ranges"
+        },
         {
           name: "HPA",
           href: "hpa",
@@ -483,7 +495,7 @@ describe("Lens integration tests", () => {
 
       afterEach(async () => {
         if (app && app.isRunning()) {
-          return util.tearDown(app);
+          return utils.tearDown(app);
         }
       });
 
@@ -499,16 +511,16 @@ describe("Lens integration tests", () => {
         await app.client.waitForVisible(".Drawer");
         await app.client.click(".drawer-title .Menu li:nth-child(2)");
         // Check if controls are available
-        await app.client.waitForVisible(".PodLogs .VirtualList");
-        await app.client.waitForVisible(".PodLogControls");
-        await app.client.waitForVisible(".PodLogControls .SearchInput");
-        await app.client.waitForVisible(".PodLogControls .SearchInput input");
+        await app.client.waitForVisible(".Logs .VirtualList");
+        await app.client.waitForVisible(".LogResourceSelector");
+        await app.client.waitForVisible(".LogResourceSelector .SearchInput");
+        await app.client.waitForVisible(".LogResourceSelector .SearchInput input");
         // Search for semicolon
         await app.client.keys(":");
-        await app.client.waitForVisible(".PodLogs .list span.active");
+        await app.client.waitForVisible(".Logs .list span.active");
         // Click through controls
-        await app.client.click(".PodLogControls .timestamps-icon");
-        await app.client.click(".PodLogControls .undo-icon");
+        await app.client.click(".LogControls .show-timestamps");
+        await app.client.click(".LogControls .show-previous");
       });
     });
 
@@ -517,7 +529,7 @@ describe("Lens integration tests", () => {
 
       afterEach(async () => {
         if (app && app.isRunning()) {
-          return util.tearDown(app);
+          return utils.tearDown(app);
         }
       });
 
diff --git a/mkdocs.yml b/mkdocs.yml
index ad3e19572e..dd72a677ea 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -34,7 +34,7 @@ nav:
       - Main Extension: extensions/guides/main-extension.md
       - Renderer Extension: extensions/guides/renderer-extension.md
       - Stores: extensions/guides/stores.md
-      - Working with mobx: extensions/guides/working-with-mobx.md
+      - Working with MobX: extensions/guides/working-with-mobx.md
     - Testing and Publishing:
       - Testing Extensions: extensions/testing-and-publishing/testing.md
       - Publishing Extensions: extensions/testing-and-publishing/publishing.md
@@ -81,6 +81,8 @@ markdown_extensions:
   - toc:
       permalink: "#"
       toc_depth: 3
+  - admonition: {}
+  - pymdownx.details: {}
 
 extra:
   generator: false
diff --git a/package.json b/package.json
index 7d00909318..57c7a8a657 100644
--- a/package.json
+++ b/package.json
@@ -219,7 +219,7 @@
     "request-promise-native": "^1.0.8",
     "semver": "^7.3.2",
     "serializr": "^2.0.3",
-    "shell-env": "^3.0.0",
+    "shell-env": "^3.0.1",
     "spdy": "^4.0.2",
     "tar": "^6.0.5",
     "tcp-port-used": "^1.0.1",
@@ -244,7 +244,7 @@
     "@types/electron-devtools-installer": "^2.2.0",
     "@types/electron-window-state": "^2.0.34",
     "@types/fs-extra": "^9.0.1",
-    "@types/hapi": "^18.0.3",
+    "@types/hapi": "^18.0.5",
     "@types/hoist-non-react-statics": "^3.3.1",
     "@types/html-webpack-plugin": "^3.2.3",
     "@types/http-proxy": "^1.17.4",
diff --git a/src/common/__tests__/workspace-store.test.ts b/src/common/__tests__/workspace-store.test.ts
index e69ebda0aa..355eb8b2ce 100644
--- a/src/common/__tests__/workspace-store.test.ts
+++ b/src/common/__tests__/workspace-store.test.ts
@@ -36,6 +36,13 @@ describe("workspace store tests", () => {
       expect(ws.getById(WorkspaceStore.defaultId)).not.toBe(null);
     });
 
+    it("default workspace should be enabled", () => {
+      const ws = WorkspaceStore.getInstance<WorkspaceStore>();
+
+      expect(ws.workspaces.size).toBe(1);
+      expect(ws.getById(WorkspaceStore.defaultId).enabled).toBe(true);
+    });
+
     it("cannot remove the default workspace", () => {
       const ws = WorkspaceStore.getInstance<WorkspaceStore>();
 
diff --git a/src/common/rbac.ts b/src/common/rbac.ts
index bd003e87a1..fbcf7c98d8 100644
--- a/src/common/rbac.ts
+++ b/src/common/rbac.ts
@@ -1,7 +1,7 @@
 import { getHostedCluster } from "./cluster-store";
 
 export type KubeResource =
-  "namespaces" | "nodes" | "events" | "resourcequotas" | "services" |
+  "namespaces" | "nodes" | "events" | "resourcequotas" | "services" | "limitranges" |
   "secrets" | "configmaps" | "ingresses" | "networkpolicies" | "persistentvolumeclaims" | "persistentvolumes" | "storageclasses" |
   "pods" | "daemonsets" | "deployments" | "statefulsets" | "replicasets" | "jobs" | "cronjobs" |
   "endpoints" | "customresourcedefinitions" | "horizontalpodautoscalers" | "podsecuritypolicies" | "poddisruptionbudgets";
@@ -23,6 +23,7 @@ export const apiResources: KubeApiResource[] = [
   { resource: "horizontalpodautoscalers" },
   { resource: "ingresses", group: "networking.k8s.io" },
   { resource: "jobs", group: "batch" },
+  { resource: "limitranges" },
   { resource: "namespaces" },
   { resource: "networkpolicies", group: "networking.k8s.io" },
   { resource: "nodes" },
diff --git a/src/common/user-store.ts b/src/common/user-store.ts
index 1e9f7646f3..cf271a011d 100644
--- a/src/common/user-store.ts
+++ b/src/common/user-store.ts
@@ -28,6 +28,7 @@ export interface UserPreferences {
   downloadBinariesPath?: string;
   kubectlBinariesPath?: string;
   openAtLogin?: boolean;
+  hiddenTableColumns?: Record<string, string[]>
 }
 
 export class UserStore extends BaseStore<UserStoreModel> {
@@ -54,6 +55,7 @@ export class UserStore extends BaseStore<UserStoreModel> {
     downloadMirror: "default",
     downloadKubectlBinaries: true,  // Download kubectl binaries matching cluster version
     openAtLogin: false,
+    hiddenTableColumns: {},
   };
 
   protected async handleOnLoad() {
diff --git a/src/common/workspace-store.ts b/src/common/workspace-store.ts
index 7688516af2..921a9126a9 100644
--- a/src/common/workspace-store.ts
+++ b/src/common/workspace-store.ts
@@ -58,14 +58,7 @@ export class Workspace implements WorkspaceModel, WorkspaceState {
    * @observable
    */
   @observable ownerRef?: string;
-  /**
-   * Is workspace enabled
-   *
-   * Workspaces that don't have ownerRef will be enabled by default. Workspaces with ownerRef need to explicitly enable a workspace.
-   *
-   * @observable
-   */
-  @observable enabled: boolean;
+
   /**
    * Last active cluster id
    *
@@ -73,6 +66,9 @@ export class Workspace implements WorkspaceModel, WorkspaceState {
    */
   @observable lastActiveClusterId?: ClusterId;
 
+
+  @observable private _enabled: boolean;
+
   constructor(data: WorkspaceModel) {
     Object.assign(this, data);
 
@@ -83,6 +79,21 @@ export class Workspace implements WorkspaceModel, WorkspaceState {
     }
   }
 
+  /**
+   * Is workspace enabled
+   *
+   * Workspaces that don't have ownerRef will be enabled by default. Workspaces with ownerRef need to explicitly enable a workspace.
+   *
+   * @observable
+   */
+  get enabled(): boolean {
+    return !this.isManaged || this._enabled;
+  }
+
+  set enabled(enabled: boolean) {
+    this._enabled = enabled;
+  }
+
   /**
    * Is workspace managed by an extension
    */
@@ -134,10 +145,18 @@ export class WorkspaceStore extends BaseStore<WorkspaceStoreModel> {
   static readonly defaultId: WorkspaceId = "default";
   private static stateRequestChannel = "workspace:states";
 
+  @observable currentWorkspaceId = WorkspaceStore.defaultId;
+  @observable workspaces = observable.map<WorkspaceId, Workspace>();
+
   private constructor() {
     super({
       configName: "lens-workspace-store",
     });
+
+    this.workspaces.set(WorkspaceStore.defaultId, new Workspace({
+      id: WorkspaceStore.defaultId,
+      name: "default"
+    }));
   }
 
   async load() {
@@ -186,15 +205,6 @@ export class WorkspaceStore extends BaseStore<WorkspaceStoreModel> {
     ipcRenderer.removeAllListeners("workspace:state");
   }
 
-  @observable currentWorkspaceId = WorkspaceStore.defaultId;
-
-  @observable workspaces = observable.map<WorkspaceId, Workspace>({
-    [WorkspaceStore.defaultId]: new Workspace({
-      id: WorkspaceStore.defaultId,
-      name: "default"
-    })
-  });
-
   @computed get currentWorkspace(): Workspace {
     return this.getById(this.currentWorkspaceId);
   }
diff --git a/src/extensions/renderer-api/components.ts b/src/extensions/renderer-api/components.ts
index 68dd5d6510..a9a519498b 100644
--- a/src/extensions/renderer-api/components.ts
+++ b/src/extensions/renderer-api/components.ts
@@ -38,4 +38,4 @@ export * from "../../renderer/components/+events/kube-event-details";
 // specific exports
 export * from "../../renderer/components/status-brick";
 export { terminalStore, createTerminalTab } from "../../renderer/components/dock/terminal.store";
-export { createPodLogsTab } from "../../renderer/components/dock/pod-logs.store";
+export { createPodLogsTab } from "../../renderer/components/dock/log.store";
diff --git a/src/extensions/renderer-api/k8s-api.ts b/src/extensions/renderer-api/k8s-api.ts
index fe04550fb7..071d8365ab 100644
--- a/src/extensions/renderer-api/k8s-api.ts
+++ b/src/extensions/renderer-api/k8s-api.ts
@@ -14,6 +14,7 @@ export { ConfigMap, configMapApi } from "../../renderer/api/endpoints";
 export { Secret, secretsApi, ISecretRef } from "../../renderer/api/endpoints";
 export { ReplicaSet, replicaSetApi } from "../../renderer/api/endpoints";
 export { ResourceQuota, resourceQuotaApi } from "../../renderer/api/endpoints";
+export { LimitRange, limitRangeApi } from "../../renderer/api/endpoints";
 export { HorizontalPodAutoscaler, hpaApi } from "../../renderer/api/endpoints";
 export { PodDisruptionBudget, pdbApi } from "../../renderer/api/endpoints";
 export { Service, serviceApi } from "../../renderer/api/endpoints";
@@ -46,6 +47,7 @@ export type { ConfigMapsStore } from "../../renderer/components/+config-maps/con
 export type { SecretsStore } from "../../renderer/components/+config-secrets/secrets.store";
 export type { ReplicaSetStore } from "../../renderer/components/+workloads-replicasets/replicasets.store";
 export type { ResourceQuotasStore } from "../../renderer/components/+config-resource-quotas/resource-quotas.store";
+export type { LimitRangesStore } from "../../renderer/components/+config-limit-ranges/limit-ranges.store";
 export type { HPAStore } from "../../renderer/components/+config-autoscalers/hpa.store";
 export type { PodDisruptionBudgetsStore } from "../../renderer/components/+config-pod-disruption-budgets/pod-disruption-budgets.store";
 export type { ServiceStore } from "../../renderer/components/+network-services/services.store";
diff --git a/src/main/cluster-manager.ts b/src/main/cluster-manager.ts
index 5717c7278d..1b468e3bb6 100644
--- a/src/main/cluster-manager.ts
+++ b/src/main/cluster-manager.ts
@@ -14,7 +14,7 @@ export class ClusterManager extends Singleton {
     // auto-init clusters
     autorun(() => {
       clusterStore.enabledClustersList.forEach(cluster => {
-        if (!cluster.initialized) {
+        if (!cluster.initialized && !cluster.initializing) {
           logger.info(`[CLUSTER-MANAGER]: init cluster`, cluster.getMeta());
           cluster.init(port);
         }
diff --git a/src/main/cluster.ts b/src/main/cluster.ts
index b9ff62e8ac..c6c14f6406 100644
--- a/src/main/cluster.ts
+++ b/src/main/cluster.ts
@@ -84,6 +84,14 @@ export class Cluster implements ClusterModel, ClusterState {
   whenInitialized = when(() => this.initialized);
   whenReady = when(() => this.ready);
 
+  /**
+   * Is cluster object initializinng on-going
+   *
+   * @observable
+   */
+  @observable initializing = false;
+
+
   /**
    * Is cluster object initialized
    *
@@ -273,6 +281,7 @@ export class Cluster implements ClusterModel, ClusterState {
    */
   @action async init(port: number) {
     try {
+      this.initializing = true;
       this.contextHandler = new ContextHandler(this);
       this.kubeconfigManager = await KubeconfigManager.create(this, this.contextHandler, port);
       this.kubeProxyUrl = `http://localhost:${port}${apiKubePrefix}`;
@@ -287,6 +296,8 @@ export class Cluster implements ClusterModel, ClusterState {
         id: this.id,
         error: err,
       });
+    } finally {
+      this.initializing = false;
     }
   }
 
diff --git a/src/renderer/api/endpoints/helm-charts.api.ts b/src/renderer/api/endpoints/helm-charts.api.ts
index a1fd497798..8beff01779 100644
--- a/src/renderer/api/endpoints/helm-charts.api.ts
+++ b/src/renderer/api/endpoints/helm-charts.api.ts
@@ -86,7 +86,7 @@ export class HelmChart {
   tillerVersion?: string;
 
   getId() {
-    return this.digest;
+    return `${this.apiVersion}/${this.name}@${this.getAppVersion()}`;
   }
 
   getName() {
diff --git a/src/renderer/api/endpoints/index.ts b/src/renderer/api/endpoints/index.ts
index f1202b9122..5ab54e7c3a 100644
--- a/src/renderer/api/endpoints/index.ts
+++ b/src/renderer/api/endpoints/index.ts
@@ -14,6 +14,7 @@ export * from "./events.api";
 export * from "./hpa.api";
 export * from "./ingress.api";
 export * from "./job.api";
+export * from "./limit-range.api";
 export * from "./namespaces.api";
 export * from "./network-policy.api";
 export * from "./nodes.api";
diff --git a/src/renderer/api/endpoints/limit-range.api.ts b/src/renderer/api/endpoints/limit-range.api.ts
new file mode 100644
index 0000000000..bbb3941c87
--- /dev/null
+++ b/src/renderer/api/endpoints/limit-range.api.ts
@@ -0,0 +1,57 @@
+import { KubeObject } from "../kube-object";
+import { KubeApi } from "../kube-api";
+import { autobind } from "../../utils";
+
+export enum LimitType {
+  CONTAINER = "Container",
+  POD = "Pod",
+  PVC = "PersistentVolumeClaim",
+}
+
+export enum Resource {
+  MEMORY = "memory",
+  CPU = "cpu",
+  STORAGE = "storage",
+  EPHEMERAL_STORAGE = "ephemeral-storage",
+}
+
+export enum LimitPart {
+  MAX = "max",
+  MIN = "min",
+  DEFAULT = "default",
+  DEFAULT_REQUEST = "defaultRequest",
+  MAX_LIMIT_REQUEST_RATIO = "maxLimitRequestRatio",
+}
+
+type LimitRangeParts = Partial<Record<LimitPart, Record<string, string>>>;
+
+export interface LimitRangeItem extends LimitRangeParts {
+  type: string
+}
+
+@autobind()
+export class LimitRange extends KubeObject {
+  static kind = "LimitRange";
+  static namespaced = true;
+  static apiBase = "/api/v1/limitranges";
+
+  spec: {
+    limits: LimitRangeItem[];
+  };
+
+  getContainerLimits() {
+    return this.spec.limits.filter(limit => limit.type === LimitType.CONTAINER);
+  }
+
+  getPodLimits() {
+    return this.spec.limits.filter(limit => limit.type === LimitType.POD);
+  }
+
+  getPVCLimits() {
+    return this.spec.limits.filter(limit => limit.type === LimitType.PVC);
+  }
+}
+
+export const limitRangeApi = new KubeApi({
+  objectConstructor: LimitRange,
+});
diff --git a/src/renderer/components/+cluster/cluster-issues.tsx b/src/renderer/components/+cluster/cluster-issues.tsx
index eb85bf79f8..0aabebaa27 100644
--- a/src/renderer/components/+cluster/cluster-issues.tsx
+++ b/src/renderer/components/+cluster/cluster-issues.tsx
@@ -23,11 +23,13 @@ interface IWarning extends ItemObject {
   kind: string;
   message: string;
   selfLink: string;
+  age: string | number;
 }
 
 enum sortBy {
   type = "type",
-  object = "object"
+  object = "object",
+  age = "age",
 }
 
 @observer
@@ -35,6 +37,7 @@ export class ClusterIssues extends React.Component<Props> {
   private sortCallbacks = {
     [sortBy.type]: (warning: IWarning) => warning.kind,
     [sortBy.object]: (warning: IWarning) => warning.getName(),
+    [sortBy.age]: (warning: IWarning) => warning.age || "",
   };
 
   @computed get warnings() {
@@ -42,15 +45,16 @@ export class ClusterIssues extends React.Component<Props> {
 
     // Node bad conditions
     nodesStore.items.forEach(node => {
-      const { kind, selfLink, getId, getName } = node;
+      const { kind, selfLink, getId, getName, getAge } = node;
 
       node.getWarningConditions().forEach(({ message }) => {
         warnings.push({
-          kind,
+          age: getAge(),
           getId,
           getName,
-          selfLink,
+          kind,
           message,
+          selfLink,
         });
       });
     });
@@ -59,12 +63,13 @@ export class ClusterIssues extends React.Component<Props> {
     const events = eventStore.getWarnings();
 
     events.forEach(error => {
-      const { message, involvedObject } = error;
+      const { message, involvedObject, getAge } = error;
       const { uid, name, kind } = involvedObject;
 
       warnings.push({
         getId: () => uid,
         getName: () => name,
+        age: getAge(),
         message,
         kind,
         selfLink: lookupApiLink(involvedObject, error),
@@ -78,7 +83,7 @@ export class ClusterIssues extends React.Component<Props> {
   getTableRow(uid: string) {
     const { warnings } = this;
     const warning = warnings.find(warn => warn.getId() == uid);
-    const { getId, getName, message, kind, selfLink } = warning;
+    const { getId, getName, message, kind, selfLink, age } = warning;
 
     return (
       <TableRow
@@ -96,6 +101,9 @@ export class ClusterIssues extends React.Component<Props> {
         <TableCell className="kind">
           {kind}
         </TableCell>
+        <TableCell className="age">
+          {age}
+        </TableCell>
       </TableRow>
     );
   }
@@ -139,6 +147,7 @@ export class ClusterIssues extends React.Component<Props> {
             <TableCell className="message">Message</TableCell>
             <TableCell className="object" sortBy={sortBy.object}>Object</TableCell>
             <TableCell className="kind" sortBy={sortBy.type}>Type</TableCell>
+            <TableCell className="timestamp" sortBy={sortBy.age}>Age</TableCell>
           </TableHead>
         </Table>
       </>
diff --git a/src/renderer/components/+config-limit-ranges/index.ts b/src/renderer/components/+config-limit-ranges/index.ts
new file mode 100644
index 0000000000..53308bdd18
--- /dev/null
+++ b/src/renderer/components/+config-limit-ranges/index.ts
@@ -0,0 +1,3 @@
+export * from "./limit-ranges";
+export * from "./limit-ranges.route";
+export * from "./limit-range-details";
diff --git a/src/renderer/components/+config-limit-ranges/limit-range-details.scss b/src/renderer/components/+config-limit-ranges/limit-range-details.scss
new file mode 100644
index 0000000000..ff39ec514a
--- /dev/null
+++ b/src/renderer/components/+config-limit-ranges/limit-range-details.scss
@@ -0,0 +1,12 @@
+.LimitRangeDetails {
+
+  .DrawerItem {
+    > .name {
+      font-weight: $font-weight-normal;
+      padding-left: 4px;
+    }
+    .DrawerItem {
+      padding-top: 4px;
+    }
+  }
+}
diff --git a/src/renderer/components/+config-limit-ranges/limit-range-details.tsx b/src/renderer/components/+config-limit-ranges/limit-range-details.tsx
new file mode 100644
index 0000000000..ab35505cc6
--- /dev/null
+++ b/src/renderer/components/+config-limit-ranges/limit-range-details.tsx
@@ -0,0 +1,97 @@
+import "./limit-range-details.scss";
+
+import React from "react";
+import { observer } from "mobx-react";
+import { KubeObjectDetailsProps } from "../kube-object";
+import { LimitPart, LimitRange, LimitRangeItem, Resource } from "../../api/endpoints/limit-range.api";
+import { kubeObjectDetailRegistry } from "../../api/kube-object-detail-registry";
+import { KubeObjectMeta } from "../kube-object/kube-object-meta";
+import { DrawerItem } from "../drawer/drawer-item";
+import { Badge } from "../badge";
+
+interface Props extends KubeObjectDetailsProps<LimitRange> {
+}
+
+function renderLimit(limit: LimitRangeItem, part: LimitPart, resource: Resource) {
+
+  const resourceLimit = limit[part]?.[resource];
+
+  if (!resourceLimit) {
+    return null;
+  }
+
+  return <Badge label={`${part}:${resourceLimit}`}/>;
+}
+
+function renderResourceLimits(limit: LimitRangeItem, resource: Resource) {
+  return (
+    <React.Fragment key={limit.type + resource}>
+      {renderLimit(limit, LimitPart.MIN, resource)}
+      {renderLimit(limit, LimitPart.MAX, resource)}
+      {renderLimit(limit, LimitPart.DEFAULT, resource)}
+      {renderLimit(limit, LimitPart.DEFAULT_REQUEST, resource)}
+      {renderLimit(limit, LimitPart.MAX_LIMIT_REQUEST_RATIO, resource)}
+    </React.Fragment>
+  );
+}
+
+function renderLimitDetails(limits: LimitRangeItem[], resources: Resource[]) {
+
+  return resources.map(resource =>
+    <DrawerItem key={resource} name={resource}>
+      {
+        limits.map(limit =>
+          renderResourceLimits(limit, resource)
+        )
+      }
+    </DrawerItem>
+  );
+}
+
+@observer
+export class LimitRangeDetails extends React.Component<Props> {
+  render() {
+    const { object: limitRange } = this.props;
+
+    if (!limitRange) return null;
+    const containerLimits = limitRange.getContainerLimits();
+    const podLimits = limitRange.getPodLimits();
+    const pvcLimits = limitRange.getPVCLimits();
+
+    return (
+      <div className="LimitRangeDetails">
+        <KubeObjectMeta object={limitRange}/>
+
+        {containerLimits.length > 0 &&
+        <DrawerItem name={`Container Limits`} labelsOnly>
+          {
+            renderLimitDetails(containerLimits, [Resource.CPU, Resource.MEMORY, Resource.EPHEMERAL_STORAGE])
+          }
+        </DrawerItem>
+        }
+        {podLimits.length > 0 &&
+        <DrawerItem name={`Pod Limits`} labelsOnly>
+          {
+            renderLimitDetails(podLimits, [Resource.CPU, Resource.MEMORY, Resource.EPHEMERAL_STORAGE])
+          }
+        </DrawerItem>
+        }
+        {pvcLimits.length > 0 &&
+        <DrawerItem name={`Persistent Volume Claim Limits`} labelsOnly>
+          {
+            renderLimitDetails(pvcLimits, [Resource.STORAGE])
+          }
+        </DrawerItem>
+        }
+      </div>
+    );
+  }
+}
+
+kubeObjectDetailRegistry.add({
+  kind: "LimitRange",
+  apiVersions: ["v1"],
+  components: {
+    Details: (props) => <LimitRangeDetails {...props} />
+  }
+});
diff --git a/src/renderer/components/+config-limit-ranges/limit-ranges.route.ts b/src/renderer/components/+config-limit-ranges/limit-ranges.route.ts
new file mode 100644
index 0000000000..09e3052350
--- /dev/null
+++ b/src/renderer/components/+config-limit-ranges/limit-ranges.route.ts
@@ -0,0 +1,11 @@
+import type { RouteProps } from "react-router";
+import { buildURL } from "../../../common/utils/buildUrl";
+
+export const limitRangesRoute: RouteProps = {
+  path: "/limitranges"
+};
+
+export interface LimitRangeRouteParams {
+}
+
+export const limitRangeURL = buildURL<LimitRangeRouteParams>(limitRangesRoute.path);
diff --git a/src/renderer/components/+config-limit-ranges/limit-ranges.scss b/src/renderer/components/+config-limit-ranges/limit-ranges.scss
new file mode 100644
index 0000000000..e5de19acfb
--- /dev/null
+++ b/src/renderer/components/+config-limit-ranges/limit-ranges.scss
@@ -0,0 +1,7 @@
+.LimitRanges {
+  .TableCell {
+    &.warning {
+      @include table-cell-warning;
+    }
+  }
+}
diff --git a/src/renderer/components/+config-limit-ranges/limit-ranges.store.ts b/src/renderer/components/+config-limit-ranges/limit-ranges.store.ts
new file mode 100644
index 0000000000..bd760efadd
--- /dev/null
+++ b/src/renderer/components/+config-limit-ranges/limit-ranges.store.ts
@@ -0,0 +1,12 @@
+import { autobind } from "../../../common/utils/autobind";
+import { KubeObjectStore } from "../../kube-object.store";
+import { apiManager } from "../../api/api-manager";
+import { LimitRange, limitRangeApi } from "../../api/endpoints/limit-range.api";
+
+@autobind()
+export class LimitRangesStore extends KubeObjectStore<LimitRange> {
+  api = limitRangeApi;
+}
+
+export const limitRangeStore = new LimitRangesStore();
+apiManager.registerStore(limitRangeStore);
diff --git a/src/renderer/components/+config-limit-ranges/limit-ranges.tsx b/src/renderer/components/+config-limit-ranges/limit-ranges.tsx
new file mode 100644
index 0000000000..8bb498c1c0
--- /dev/null
+++ b/src/renderer/components/+config-limit-ranges/limit-ranges.tsx
@@ -0,0 +1,53 @@
+import "./limit-ranges.scss";
+
+import { RouteComponentProps } from "react-router";
+import { observer } from "mobx-react";
+import { KubeObjectListLayout } from "../kube-object/kube-object-list-layout";
+import { limitRangeStore } from "./limit-ranges.store";
+import { LimitRangeRouteParams } from "./limit-ranges.route";
+import React from "react";
+import { KubeObjectStatusIcon } from "../kube-object-status-icon";
+import { LimitRange } from "../../api/endpoints/limit-range.api";
+
+enum sortBy {
+  name = "name",
+  namespace = "namespace",
+  age = "age",
+}
+
+interface Props extends RouteComponentProps<LimitRangeRouteParams> {
+}
+
+@observer
+export class LimitRanges extends React.Component<Props> {
+  render() {
+    return (
+      <KubeObjectListLayout
+        className="LimitRanges"
+        store={limitRangeStore}
+        sortingCallbacks={{
+          [sortBy.name]: (item: LimitRange) => item.getName(),
+          [sortBy.namespace]: (item: LimitRange) => item.getNs(),
+          [sortBy.age]: (item: LimitRange) => item.metadata.creationTimestamp,
+        }}
+        searchFilters={[
+          (item: LimitRange) => item.getName(),
+          (item: LimitRange) => item.getNs(),
+        ]}
+        renderHeaderTitle={"Limit Ranges"}
+        renderTableHeader={[
+          { title: "Name", className: "name", sortBy: sortBy.name },
+          { className: "warning" },
+          { title: "Namespace", className: "namespace", sortBy: sortBy.namespace },
+          { title: "Age", className: "age", sortBy: sortBy.age },
+        ]}
+        renderTableContents={(limitRange: LimitRange) => [
+          limitRange.getName(),
+          <KubeObjectStatusIcon key="icon" object={limitRange}/>,
+          limitRange.getNs(),
+          limitRange.getAge(),
+        ]}
+      />
+    );
+  }
+}
diff --git a/src/renderer/components/+config/config.tsx b/src/renderer/components/+config/config.tsx
index bb70dd3fb5..e3158459ba 100644
--- a/src/renderer/components/+config/config.tsx
+++ b/src/renderer/components/+config/config.tsx
@@ -8,6 +8,7 @@ import { resourceQuotaRoute, ResourceQuotas, resourceQuotaURL } from "../+config
 import { pdbRoute, pdbURL, PodDisruptionBudgets } from "../+config-pod-disruption-budgets";
 import { HorizontalPodAutoscalers, hpaRoute, hpaURL } from "../+config-autoscalers";
 import { isAllowedResource } from "../../../common/rbac";
+import { LimitRanges, limitRangesRoute, limitRangeURL } from "../+config-limit-ranges";
 
 @observer
 export class Config extends React.Component {
@@ -42,6 +43,15 @@ export class Config extends React.Component {
       });
     }
 
+    if (isAllowedResource("limitranges")) {
+      routes.push({
+        title: "Limit Ranges",
+        component: LimitRanges,
+        url: limitRangeURL({ query }),
+        routePath: limitRangesRoute.path.toString(),
+      });
+    }
+
     if (isAllowedResource("horizontalpodautoscalers")) {
       routes.push({
         title: "HPA",
diff --git a/src/renderer/components/+namespaces/namespace-details.tsx b/src/renderer/components/+namespaces/namespace-details.tsx
index f687630a96..5dfa93cea7 100644
--- a/src/renderer/components/+namespaces/namespace-details.tsx
+++ b/src/renderer/components/+namespaces/namespace-details.tsx
@@ -12,6 +12,7 @@ import { Spinner } from "../spinner";
 import { resourceQuotaStore } from "../+config-resource-quotas/resource-quotas.store";
 import { KubeObjectMeta } from "../kube-object/kube-object-meta";
 import { kubeObjectDetailRegistry } from "../../api/kube-object-detail-registry";
+import { limitRangeStore } from "../+config-limit-ranges/limit-ranges.store";
 
 interface Props extends KubeObjectDetailsProps<Namespace> {
 }
@@ -24,8 +25,15 @@ export class NamespaceDetails extends React.Component<Props> {
     return resourceQuotaStore.getAllByNs(namespace);
   }
 
+  @computed get limitranges() {
+    const namespace = this.props.object.getName();
+
+    return limitRangeStore.getAllByNs(namespace);
+  }
+
   componentDidMount() {
     resourceQuotaStore.loadAll();
+    limitRangeStore.loadAll();
   }
 
   render() {
@@ -52,6 +60,16 @@ export class NamespaceDetails extends React.Component<Props> {
             );
           })}
         </DrawerItem>
+        <DrawerItem name={`Limit Ranges`}>
+          {!this.limitranges && limitRangeStore.isLoading && <Spinner/>}
+          {this.limitranges.map(limitrange => {
+            return (
+              <Link key={limitrange.getId()} to={getDetailsUrl(limitrange.selfLink)}>
+                {limitrange.getName()}
+              </Link>
+            );
+          })}
+        </DrawerItem>
       </div>
     );
   }
diff --git a/src/renderer/components/+workloads-pods/pods.tsx b/src/renderer/components/+workloads-pods/pods.tsx
index 88981b968f..2296b98317 100644
--- a/src/renderer/components/+workloads-pods/pods.tsx
+++ b/src/renderer/components/+workloads-pods/pods.tsx
@@ -74,6 +74,8 @@ export class Pods extends React.Component<Props> {
       <KubeObjectListLayout
         className="Pods" store={podsStore}
         dependentStores={[volumeClaimStore, eventStore]}
+        tableId = "workloads_pods"
+        isConfigurable
         sortingCallbacks={{
           [sortBy.name]: (pod: Pod) => pod.getName(),
           [sortBy.namespace]: (pod: Pod) => pod.getNs(),
@@ -94,7 +96,7 @@ export class Pods extends React.Component<Props> {
         renderHeaderTitle="Pods"
         renderTableHeader={[
           { title: "Name", className: "name", sortBy: sortBy.name },
-          { className: "warning" },
+          { className: "warning", showWithColumn: "name" },
           { title: "Namespace", className: "namespace", sortBy: sortBy.namespace },
           { title: "Containers", className: "containers", sortBy: sortBy.containers },
           { title: "Restarts", className: "restarts", sortBy: sortBy.restarts },
diff --git a/src/renderer/components/checkbox/checkbox.tsx b/src/renderer/components/checkbox/checkbox.tsx
index 0831e6122f..f97740a874 100644
--- a/src/renderer/components/checkbox/checkbox.tsx
+++ b/src/renderer/components/checkbox/checkbox.tsx
@@ -30,7 +30,7 @@ export class Checkbox extends React.PureComponent<CheckboxProps> {
 
   render() {
     const { label, inline, className, value, theme, children, ...inputProps } = this.props;
-    const componentClass = cssNames("Checkbox flex", className, {
+    const componentClass = cssNames("Checkbox flex align-center", className, {
       inline,
       checked: value,
       disabled: this.props.disabled,
diff --git a/src/renderer/components/dock/dock-tabs.tsx b/src/renderer/components/dock/dock-tabs.tsx
index 54451ddd89..6bf9280d59 100644
--- a/src/renderer/components/dock/dock-tabs.tsx
+++ b/src/renderer/components/dock/dock-tabs.tsx
@@ -7,7 +7,7 @@ import { DockTab } from "./dock-tab";
 import { IDockTab } from "./dock.store";
 import { isEditResourceTab } from "./edit-resource.store";
 import { isInstallChartTab } from "./install-chart.store";
-import { isPodLogsTab } from "./pod-logs.store";
+import { isLogsTab } from "./log.store";
 import { TerminalTab } from "./terminal-tab";
 import { isTerminalTab } from "./terminal.store";
 import { isUpgradeChartTab } from "./upgrade-chart.store";
@@ -33,7 +33,7 @@ export const DockTabs = ({ tabs, autoFocus, selectedTab, onChangeTab }: Props) =
       return <DockTab value={tab} icon={<Icon svg="install" />} />;
     }
 
-    if (isPodLogsTab(tab)) {
+    if (isLogsTab(tab)) {
       return <DockTab value={tab} icon="subject" />;
     }
   };
diff --git a/src/renderer/components/dock/dock.tsx b/src/renderer/components/dock/dock.tsx
index f02502eab7..c8adf82992 100644
--- a/src/renderer/components/dock/dock.tsx
+++ b/src/renderer/components/dock/dock.tsx
@@ -16,8 +16,8 @@ import { EditResource } from "./edit-resource";
 import { isEditResourceTab } from "./edit-resource.store";
 import { InstallChart } from "./install-chart";
 import { isInstallChartTab } from "./install-chart.store";
-import { PodLogs } from "./pod-logs";
-import { isPodLogsTab } from "./pod-logs.store";
+import { Logs } from "./logs";
+import { isLogsTab } from "./log.store";
 import { TerminalWindow } from "./terminal-window";
 import { createTerminalTab, isTerminalTab } from "./terminal.store";
 import { UpgradeChart } from "./upgrade-chart";
@@ -64,7 +64,7 @@ export class Dock extends React.Component<Props> {
         {isInstallChartTab(tab) && <InstallChart tab={tab} />}
         {isUpgradeChartTab(tab) && <UpgradeChart tab={tab} />}
         {isTerminalTab(tab) && <TerminalWindow tab={tab} />}
-        {isPodLogsTab(tab) && <PodLogs tab={tab} />}
+        {isLogsTab(tab) && <Logs tab={tab} />}
       </div>
     );
   }
diff --git a/src/renderer/components/dock/info-panel.scss b/src/renderer/components/dock/info-panel.scss
index 23dcc52243..482dbee02d 100644
--- a/src/renderer/components/dock/info-panel.scss
+++ b/src/renderer/components/dock/info-panel.scss
@@ -2,7 +2,6 @@
   @include hidden-scrollbar;
 
   background: $dockInfoBackground;
-  border-bottom: 1px solid $dockInfoBorderColor;
   padding: $padding $padding * 2;
   flex-shrink: 0;
 
diff --git a/src/renderer/components/dock/log-controls.scss b/src/renderer/components/dock/log-controls.scss
new file mode 100644
index 0000000000..e446cca235
--- /dev/null
+++ b/src/renderer/components/dock/log-controls.scss
@@ -0,0 +1,6 @@
+.LogControls {
+  @include hidden-scrollbar;
+
+  background: $dockInfoBackground;
+  padding: $padding $padding * 2;
+}
\ No newline at end of file
diff --git a/src/renderer/components/dock/log-controls.tsx b/src/renderer/components/dock/log-controls.tsx
new file mode 100644
index 0000000000..cedff7fbb9
--- /dev/null
+++ b/src/renderer/components/dock/log-controls.tsx
@@ -0,0 +1,68 @@
+import "./log-controls.scss";
+
+import React from "react";
+import { observer } from "mobx-react";
+
+import { Pod } from "../../api/endpoints";
+import { cssNames, saveFileDialog } from "../../utils";
+import { IPodLogsData, podLogsStore } from "./log.store";
+import { Checkbox } from "../checkbox";
+import { Icon } from "../icon";
+
+interface Props {
+  tabData: IPodLogsData
+  logs: string[]
+  save: (data: Partial<IPodLogsData>) => void
+  reload: () => void
+}
+
+export const LogControls = observer((props: Props) => {
+  const { tabData, save, reload, logs } = props;
+  const { showTimestamps, previous } = tabData;
+  const since = logs.length ? podLogsStore.getTimestamps(logs[0]) : null;
+  const pod = new Pod(tabData.pod);
+
+  const toggleTimestamps = () => {
+    save({ showTimestamps: !showTimestamps });
+  };
+
+  const togglePrevious = () => {
+    save({ previous: !previous });
+    reload();
+  };
+
+  const downloadLogs = () => {
+    const fileName = pod.getName();
+    const logsToDownload = showTimestamps ? logs : podLogsStore.logsWithoutTimestamps;
+
+    saveFileDialog(`${fileName}.log`, logsToDownload.join("\n"), "text/plain");
+  };
+
+  return (
+    <div className={cssNames("LogControls flex gaps align-center justify-space-between wrap")}>
+      <div className="time-range">
+        {since && `Logs from ${new Date(since[0]).toLocaleString()}`}
+      </div>
+      <div className="flex gaps align-center">
+        <Checkbox
+          label="Show timestamps"
+          value={showTimestamps}
+          onChange={toggleTimestamps}
+          className="show-timestamps"
+        />
+        <Checkbox
+          label="Show previous terminated container"
+          value={previous}
+          onChange={togglePrevious}
+          className="show-previous"
+        />
+        <Icon
+          material="get_app"
+          onClick={downloadLogs}
+          tooltip="Download"
+          className="download-icon"
+        />
+      </div>
+    </div>
+  );
+});
diff --git a/src/renderer/components/dock/pod-log-list.scss b/src/renderer/components/dock/log-list.scss
similarity index 99%
rename from src/renderer/components/dock/pod-log-list.scss
rename to src/renderer/components/dock/log-list.scss
index 9b923b520b..8a39dcf925 100644
--- a/src/renderer/components/dock/pod-log-list.scss
+++ b/src/renderer/components/dock/log-list.scss
@@ -1,4 +1,4 @@
-.PodLogList {
+.LogList {
   --overlay-bg: #8cc474b8;
   --overlay-active-bg: orange;
 
diff --git a/src/renderer/components/dock/pod-log-list.tsx b/src/renderer/components/dock/log-list.tsx
similarity index 94%
rename from src/renderer/components/dock/pod-log-list.tsx
rename to src/renderer/components/dock/log-list.tsx
index c876d0c362..74d64d2f58 100644
--- a/src/renderer/components/dock/pod-log-list.tsx
+++ b/src/renderer/components/dock/log-list.tsx
@@ -1,4 +1,4 @@
-import "./pod-log-list.scss";
+import "./log-list.scss";
 
 import React from "react";
 import AnsiUp from "ansi_up";
@@ -14,7 +14,7 @@ import { Button } from "../button";
 import { Icon } from "../icon";
 import { Spinner } from "../spinner";
 import { VirtualList } from "../virtual-list";
-import { podLogsStore } from "./pod-logs.store";
+import { podLogsStore } from "./log.store";
 
 interface Props {
   logs: string[]
@@ -26,7 +26,7 @@ interface Props {
 const colorConverter = new AnsiUp();
 
 @observer
-export class PodLogList extends React.Component<Props> {
+export class LogList extends React.Component<Props> {
   @observable isJumpButtonVisible = false;
   @observable isLastLineVisible = true;
 
@@ -206,19 +206,23 @@ export class PodLogList extends React.Component<Props> {
     const rowHeights = new Array(this.logs.length).fill(this.lineHeight);
 
     if (isInitLoading) {
-      return <Spinner center/>;
+      return (
+        <div className="LogList flex box grow align-center justify-center">
+          <Spinner center/>
+        </div>
+      );
     }
 
     if (!this.logs.length) {
       return (
-        <div className="PodLogList flex box grow align-center justify-center">
+        <div className="LogList flex box grow align-center justify-center">
           There are no logs available for container
         </div>
       );
     }
 
     return (
-      <div className={cssNames("PodLogList flex", { isLoading })}>
+      <div className={cssNames("LogList flex", { isLoading })}>
         <VirtualList
           items={this.logs}
           rowHeights={rowHeights}
diff --git a/src/renderer/components/dock/pod-log-controls.scss b/src/renderer/components/dock/log-resource-selector.scss
similarity index 62%
rename from src/renderer/components/dock/pod-log-controls.scss
rename to src/renderer/components/dock/log-resource-selector.scss
index 795d06c67e..766eeb6b4d 100644
--- a/src/renderer/components/dock/pod-log-controls.scss
+++ b/src/renderer/components/dock/log-resource-selector.scss
@@ -1,4 +1,4 @@
-.PodLogControls {
+.LogResourceSelector {
   .Select {
     min-width: 150px;
   }
diff --git a/src/renderer/components/dock/log-resource-selector.tsx b/src/renderer/components/dock/log-resource-selector.tsx
new file mode 100644
index 0000000000..a4b79bcfad
--- /dev/null
+++ b/src/renderer/components/dock/log-resource-selector.tsx
@@ -0,0 +1,66 @@
+import "./log-resource-selector.scss";
+
+import React from "react";
+import { observer } from "mobx-react";
+
+import { IPodContainer, Pod } from "../../api/endpoints";
+import { Badge } from "../badge";
+import { Select, SelectOption } from "../select";
+import { IPodLogsData } from "./log.store";
+
+interface Props {
+  tabData: IPodLogsData
+  save: (data: Partial<IPodLogsData>) => void
+  reload: () => void
+}
+
+export const LogResourceSelector = observer((props: Props) => {
+  const { tabData, save, reload } = props;
+  const { selectedContainer, containers, initContainers } = tabData;
+  const pod = new Pod(tabData.pod);
+
+  const onContainerChange = (option: SelectOption) => {
+    const { containers, initContainers } = tabData;
+
+    save({
+      selectedContainer: containers
+        .concat(initContainers)
+        .find(container => container.name === option.value)
+    });
+    reload();
+  };
+
+  const getSelectOptions = (containers: IPodContainer[]) => {
+    return containers.map(container => {
+      return {
+        value: container.name,
+        label: container.name
+      };
+    });
+  };
+
+  const containerSelectOptions = [
+    {
+      label: `Containers`,
+      options: getSelectOptions(containers)
+    },
+    {
+      label: `Init Containers`,
+      options: getSelectOptions(initContainers),
+    }
+  ];
+
+  return (
+    <div className="LogResourceSelector flex gaps align-center">
+      <span>Namespace</span> <Badge label={pod.getNs()}/>
+      <span>Pod</span> <Badge label={pod.getName()}/>
+      <span>Container</span>
+      <Select
+        options={containerSelectOptions}
+        value={{ label: selectedContainer.name, value: selectedContainer.name }}
+        onChange={onContainerChange}
+        autoConvertOptions={false}
+      />
+    </div>
+  );
+});
diff --git a/src/renderer/components/dock/pod-log-search.scss b/src/renderer/components/dock/log-search.scss
similarity index 61%
rename from src/renderer/components/dock/pod-log-search.scss
rename to src/renderer/components/dock/log-search.scss
index 7d3ea9d92a..eec9a74749 100644
--- a/src/renderer/components/dock/pod-log-search.scss
+++ b/src/renderer/components/dock/log-search.scss
@@ -1,10 +1,13 @@
-.PodLogsSearch {
+.LogSearch {
   .SearchInput {
     min-width: 150px;
-    width: 150px;
 
     .find-count {
       margin-left: 2px;
     }
+
+    label {
+      padding-bottom: 7px;
+    }
   }
 }
\ No newline at end of file
diff --git a/src/renderer/components/dock/pod-log-search.tsx b/src/renderer/components/dock/log-search.tsx
similarity index 85%
rename from src/renderer/components/dock/pod-log-search.tsx
rename to src/renderer/components/dock/log-search.tsx
index 675c556c3e..a770b78592 100644
--- a/src/renderer/components/dock/pod-log-search.tsx
+++ b/src/renderer/components/dock/log-search.tsx
@@ -1,4 +1,4 @@
-import "./pod-log-search.scss";
+import "./log-search.scss";
 
 import React, { useEffect } from "react";
 import { observer } from "mobx-react";
@@ -16,7 +16,7 @@ interface Props extends PodLogSearchProps {
   logs: string[]
 }
 
-export const PodLogSearch = observer((props: Props) => {
+export const LogSearch = observer((props: Props) => {
   const { logs, onSearch, toPrevOverlay, toNextOverlay } = props;
   const { setNextOverlayActive, setPrevOverlayActive, searchQuery, occurrences, activeFind, totalFinds } = searchStore;
   const jumpDisabled = !searchQuery || !occurrences.length;
@@ -57,11 +57,11 @@ export const PodLogSearch = observer((props: Props) => {
   }, [logs]);
 
   return (
-    <div className="PodLogsSearch flex box grow justify-flex-end gaps align-center">
+    <div className="LogSearch flex box grow justify-flex-end gaps align-center">
       <SearchInput
         value={searchQuery}
         onChange={setSearch}
-        showClearIcon={false}
+        showClearIcon={true}
         contentRight={totalFinds > 0 && findCounts}
         onClear={onClear}
         onKeyDown={onKeyDown}
@@ -78,11 +78,6 @@ export const PodLogSearch = observer((props: Props) => {
         onClick={onNextOverlay}
         disabled={jumpDisabled}
       />
-      <Icon
-        material="close"
-        tooltip={`Clear`}
-        onClick={onClear}
-      />
     </div>
   );
 });
diff --git a/src/renderer/components/dock/pod-logs.store.ts b/src/renderer/components/dock/log.store.ts
similarity index 96%
rename from src/renderer/components/dock/pod-logs.store.ts
rename to src/renderer/components/dock/log.store.ts
index 9e69a15b7f..4dcfccf981 100644
--- a/src/renderer/components/dock/pod-logs.store.ts
+++ b/src/renderer/components/dock/log.store.ts
@@ -21,7 +21,7 @@ type PodLogLine = string;
 export const logRange = 500;
 
 @autobind()
-export class PodLogsStore extends DockTabStore<IPodLogsData> {
+export class LogStore extends DockTabStore<IPodLogsData> {
   private refresher = interval(10, () => {
     const id = dockStore.selectedTabId;
 
@@ -39,7 +39,7 @@ export class PodLogsStore extends DockTabStore<IPodLogsData> {
     autorun(() => {
       const { selectedTab, isOpen } = dockStore;
 
-      if (isPodLogsTab(selectedTab) && isOpen) {
+      if (isLogsTab(selectedTab) && isOpen) {
         this.refresher.start();
       } else {
         this.refresher.stop();
@@ -203,7 +203,7 @@ export class PodLogsStore extends DockTabStore<IPodLogsData> {
   }
 }
 
-export const podLogsStore = new PodLogsStore();
+export const podLogsStore = new LogStore();
 
 export function createPodLogsTab(data: IPodLogsData, tabParams: Partial<IDockTab> = {}) {
   const podId = data.pod.getId();
@@ -227,6 +227,6 @@ export function createPodLogsTab(data: IPodLogsData, tabParams: Partial<IDockTab
   return tab;
 }
 
-export function isPodLogsTab(tab: IDockTab) {
+export function isLogsTab(tab: IDockTab) {
   return tab && tab.kind === TabKind.POD_LOGS;
 }
diff --git a/src/renderer/components/dock/pod-logs.tsx b/src/renderer/components/dock/logs.tsx
similarity index 62%
rename from src/renderer/components/dock/pod-logs.tsx
rename to src/renderer/components/dock/logs.tsx
index 696c2bf0ab..c8ccd6d249 100644
--- a/src/renderer/components/dock/pod-logs.tsx
+++ b/src/renderer/components/dock/logs.tsx
@@ -6,9 +6,11 @@ import { searchStore } from "../../../common/search-store";
 import { autobind } from "../../utils";
 import { IDockTab } from "./dock.store";
 import { InfoPanel } from "./info-panel";
-import { PodLogControls } from "./pod-log-controls";
-import { PodLogList } from "./pod-log-list";
-import { IPodLogsData, podLogsStore } from "./pod-logs.store";
+import { LogResourceSelector } from "./log-resource-selector";
+import { LogList } from "./log-list";
+import { IPodLogsData, podLogsStore } from "./log.store";
+import { LogSearch } from "./log-search";
+import { LogControls } from "./log-controls";
 
 interface Props {
   className?: string
@@ -16,10 +18,10 @@ interface Props {
 }
 
 @observer
-export class PodLogs extends React.Component<Props> {
+export class Logs extends React.Component<Props> {
   @observable isLoading = true;
 
-  private logListElement = React.createRef<PodLogList>(); // A reference for VirtualList component
+  private logListElement = React.createRef<LogList>(); // A reference for VirtualList component
 
   componentDidMount() {
     disposeOnUnmount(this,
@@ -79,39 +81,55 @@ export class PodLogs extends React.Component<Props> {
     }, 100);
   }
 
-  render() {
+  renderResourceSelector() {
     const logs = podLogsStore.logs;
-
+    const searchLogs = this.tabData.showTimestamps ? logs : podLogsStore.logsWithoutTimestamps;
     const controls = (
-      <PodLogControls
-        ready={!this.isLoading}
-        tabId={this.tabId}
-        tabData={this.tabData}
-        logs={logs}
-        save={this.save}
-        reload={this.reload}
-        onSearch={this.onSearch}
-        toPrevOverlay={this.toOverlay}
-        toNextOverlay={this.toOverlay}
-      />
+      <div className="flex gaps">
+        <LogResourceSelector
+          tabData={this.tabData}
+          save={this.save}
+          reload={this.reload}
+        />
+        <LogSearch
+          onSearch={this.onSearch}
+          logs={searchLogs}
+          toPrevOverlay={this.toOverlay}
+          toNextOverlay={this.toOverlay}
+        />
+      </div>
     );
 
+    return (
+      <InfoPanel
+        tabId={this.props.tab.id}
+        controls={controls}
+        showSubmitClose={false}
+        showButtons={false}
+        showStatusPanel={false}
+      />
+    );
+  }
+
+  render() {
+    const logs = podLogsStore.logs;
+
     return (
       <div className="PodLogs flex column">
-        <InfoPanel
-          tabId={this.props.tab.id}
-          controls={controls}
-          showSubmitClose={false}
-          showButtons={false}
-          showStatusPanel={false}
-        />
-        <PodLogList
+        {this.renderResourceSelector()}
+        <LogList
           logs={logs}
           id={this.tabId}
           isLoading={this.isLoading}
           load={this.load}
           ref={this.logListElement}
         />
+        <LogControls
+          logs={logs}
+          tabData={this.tabData}
+          save={this.save}
+          reload={this.reload}
+        />
       </div>
     );
   }
diff --git a/src/renderer/components/dock/pod-log-controls.tsx b/src/renderer/components/dock/pod-log-controls.tsx
deleted file mode 100644
index bd6cb9db15..0000000000
--- a/src/renderer/components/dock/pod-log-controls.tsx
+++ /dev/null
@@ -1,126 +0,0 @@
-import "./pod-log-controls.scss";
-import React from "react";
-import { observer } from "mobx-react";
-import { IPodLogsData, podLogsStore } from "./pod-logs.store";
-import { Select, SelectOption } from "../select";
-import { Badge } from "../badge";
-import { Icon } from "../icon";
-import { cssNames, saveFileDialog } from "../../utils";
-import { Pod } from "../../api/endpoints";
-import { PodLogSearch, PodLogSearchProps } from "./pod-log-search";
-
-interface Props extends PodLogSearchProps {
-  ready: boolean
-  tabId: string
-  tabData: IPodLogsData
-  logs: string[]
-  save: (data: Partial<IPodLogsData>) => void
-  reload: () => void
-  onSearch: (query: string) => void
-}
-
-export const PodLogControls = observer((props: Props) => {
-  const { tabData, save, reload, logs } = props;
-  const { selectedContainer, showTimestamps, previous } = tabData;
-  const since = logs.length ? podLogsStore.getTimestamps(logs[0]) : null;
-  const pod = new Pod(tabData.pod);
-
-  const toggleTimestamps = () => {
-    save({ showTimestamps: !showTimestamps });
-  };
-
-  const togglePrevious = () => {
-    save({ previous: !previous });
-    reload();
-  };
-
-  const downloadLogs = () => {
-    const fileName = selectedContainer ? selectedContainer.name : pod.getName();
-    const logsToDownload = showTimestamps ? logs : podLogsStore.logsWithoutTimestamps;
-
-    saveFileDialog(`${fileName}.log`, logsToDownload.join("\n"), "text/plain");
-  };
-
-  const onContainerChange = (option: SelectOption) => {
-    const { containers, initContainers } = tabData;
-
-    save({
-      selectedContainer: containers
-        .concat(initContainers)
-        .find(container => container.name === option.value)
-    });
-    reload();
-  };
-
-  const containerSelectOptions = () => {
-    const { containers, initContainers } = tabData;
-
-    return [
-      {
-        label: `Containers`,
-        options: containers.map(container => {
-          return { value: container.name };
-        }),
-      },
-      {
-        label: `Init Containers`,
-        options: initContainers.map(container => {
-          return { value: container.name };
-        }),
-      }
-    ];
-  };
-
-  const formatOptionLabel = (option: SelectOption) => {
-    const { value, label } = option;
-
-    return label || <><Icon small material="view_carousel"/> {value}</>;
-  };
-
-  return (
-    <div className="PodLogControls flex gaps align-center">
-      <span>Pod:</span> <Badge label={pod.getName()}/>
-      <span>Namespace:</span> <Badge label={pod.getNs()}/>
-      <span>Container</span>
-      <Select
-        options={containerSelectOptions()}
-        value={{ value: selectedContainer.name }}
-        formatOptionLabel={formatOptionLabel}
-        onChange={onContainerChange}
-        autoConvertOptions={false}
-      />
-      <div className="time-range">
-        {since && (
-          <>
-            Since{" "}
-            <b>{new Date(since[0]).toLocaleString()}</b>
-          </>
-        )}
-      </div>
-      <div className="flex box grow gaps align-center">
-        <Icon
-          material="av_timer"
-          onClick={toggleTimestamps}
-          className={cssNames("timestamps-icon", { active: showTimestamps })}
-          tooltip={`${showTimestamps ? `Hide` : `Show`} timestamps`}
-        />
-        <Icon
-          material="history"
-          onClick={togglePrevious}
-          className={cssNames("undo-icon", { active: previous })}
-          tooltip={(previous ? `Show current logs` : `Show previous terminated container logs`)}
-        />
-        <Icon
-          material="get_app"
-          onClick={downloadLogs}
-          tooltip={`Save`}
-          className="download-icon"
-        />
-        <PodLogSearch
-          {...props}
-          logs={showTimestamps ? logs : podLogsStore.logsWithoutTimestamps}
-        />
-      </div>
-    </div>
-  );
-});
diff --git a/src/renderer/components/item-object-list/item-list-layout.tsx b/src/renderer/components/item-object-list/item-list-layout.tsx
index bdd6302f5a..38e0e0218d 100644
--- a/src/renderer/components/item-object-list/item-list-layout.tsx
+++ b/src/renderer/components/item-object-list/item-list-layout.tsx
@@ -1,4 +1,5 @@
 import "./item-list-layout.scss";
+import "./table-menu.scss";
 import groupBy from "lodash/groupBy";
 
 import React, { ReactNode } from "react";
@@ -18,6 +19,11 @@ import { PageFiltersList } from "./page-filters-list";
 import { PageFiltersSelect } from "./page-filters-select";
 import { NamespaceSelectFilter } from "../+namespaces/namespace-select";
 import { themeStore } from "../../theme.store";
+import { MenuActions} from "../menu/menu-actions";
+import { MenuItem } from "../menu";
+import { Checkbox } from "../checkbox";
+import { userStore } from "../../../common/user-store";
+import logger from "../../../main/logger";
 
 // todo: refactor, split to small re-usable components
 
@@ -32,6 +38,7 @@ interface IHeaderPlaceholders {
 }
 
 export interface ItemListLayoutProps<T extends ItemObject = ItemObject> {
+  tableId?: string;
   className: IClassName;
   store: ItemStore<T>;
   dependentStores?: ItemStore[];
@@ -50,6 +57,7 @@ export interface ItemListLayoutProps<T extends ItemObject = ItemObject> {
   isReady?: boolean; // show loading indicator while not ready
   isSelectable?: boolean; // show checkbox in rows for selecting items
   isSearchable?: boolean; // apply search-filter & add search-input
+  isConfigurable?: boolean;
   copyClassNameFromHeadCells?: boolean;
   sortingCallbacks?: { [sortBy: string]: TableSortCallback };
   tableProps?: Partial<TableProps>; // low-level table configuration
@@ -74,6 +82,7 @@ const defaultProps: Partial<ItemListLayoutProps> = {
   showHeader: true,
   isSearchable: true,
   isSelectable: true,
+  isConfigurable: false,
   copyClassNameFromHeadCells: true,
   dependentStores: [],
   filterItems: [],
@@ -89,7 +98,7 @@ interface ItemListLayoutUserSettings {
 @observer
 export class ItemListLayout extends React.Component<ItemListLayoutProps> {
   static defaultProps = defaultProps as object;
-
+  @observable hiddenColumnNames = new Set<string>();
   @observable isUnmounting = false;
 
   // default user settings (ui show-hide tweaks mostly)
@@ -111,7 +120,10 @@ export class ItemListLayout extends React.Component<ItemListLayoutProps> {
   }
 
   async componentDidMount() {
-    const { store, dependentStores, isClusterScoped } = this.props;
+    const { store, dependentStores, isClusterScoped, tableId } = this.props;
+
+    if (this.canBeConfigured) this.hiddenColumnNames = new Set(userStore.preferences?.hiddenTableColumns?.[tableId]);
+
     const stores = [store, ...dependentStores];
 
     if (!isClusterScoped) stores.push(namespaceStore);
@@ -216,6 +228,42 @@ export class ItemListLayout extends React.Component<ItemListLayoutProps> {
     return this.applyFilters(filterItems, allItems);
   }
 
+  updateColumnFilter(checkboxValue: boolean, columnName: string) {
+    if (checkboxValue){
+      this.hiddenColumnNames.delete(columnName);
+    } else {
+      this.hiddenColumnNames.add(columnName);
+    }
+
+    if (this.canBeConfigured) {
+      userStore.preferences.hiddenTableColumns[this.props.tableId] = Array.from(this.hiddenColumnNames);
+    }
+  }
+
+  columnIsVisible(index: number): boolean {
+    const {renderTableHeader} = this.props;
+
+    if (!this.canBeConfigured) return true;
+
+    return !this.hiddenColumnNames.has(renderTableHeader[index].showWithColumn ?? renderTableHeader[index].className);
+  }
+
+  get canBeConfigured(): boolean {
+    const { isConfigurable, tableId, renderTableHeader } = this.props;
+
+    if (!isConfigurable || !tableId) {
+      return false;
+    }
+
+    if (!renderTableHeader?.every(({ className }) => className)) {
+      logger.warning("[ItemObjectList]: cannot configure an object list without all headers being identifiable");
+
+      return false;
+    }
+
+    return true;
+  }
+
   @autobind()
   getRow(uid: string) {
     const {
@@ -259,7 +307,7 @@ export class ItemListLayout extends React.Component<ItemListLayoutProps> {
                 }
               }
 
-              return <TableCell key={index} {...cellProps} />;
+              return this.columnIsVisible(index) ? <TableCell key={index} {...cellProps} /> : null;
             })
         }
         {renderItemMenu && (
@@ -431,14 +479,19 @@ export class ItemListLayout extends React.Component<ItemListLayoutProps> {
                     onClick={prevDefault(() => store.toggleSelectionAll(items))}
                   />
                 )}
-                {renderTableHeader.map((cellProps, index) => <TableCell key={index} {...cellProps} />)}
-                {renderItemMenu && <TableCell className="menu" />}
+                {renderTableHeader.map((cellProps, index) => this.columnIsVisible(index) ? <TableCell key={index} {...cellProps} /> : null)}
+                { renderItemMenu &&
+                  <TableCell className="menu" >
+                    {this.canBeConfigured && this.renderColumnMenu()}
+                  </TableCell>
+                }
               </TableHead>
             )}
             {
               !virtual && items.map(item => this.getRow(item.getId()))
             }
           </Table>
+
         )}
         <AddRemoveButtons
           onRemove={selectedItems.length ? removeItemsDialog : null}
@@ -449,6 +502,29 @@ export class ItemListLayout extends React.Component<ItemListLayoutProps> {
     );
   }
 
+  renderColumnMenu() {
+    const { renderTableHeader} = this.props;
+
+    return (
+      <MenuActions
+        toolbar = {false}
+        autoCloseOnSelect = {false}
+        className={cssNames("KubeObjectMenu")}
+      >
+        {renderTableHeader.map((cellProps, index) => (
+          !cellProps.showWithColumn &&
+            <MenuItem key={index} className="input">
+              <Checkbox label = {cellProps.title ?? `<${cellProps.className}>`}
+                className = "MenuCheckbox"
+                value ={!this.hiddenColumnNames.has(cellProps.className)}
+                onChange = {(v) => this.updateColumnFilter(v, cellProps.className)}
+              />
+            </MenuItem>
+        ))}
+      </MenuActions>
+    );
+  }
+
   renderFooter() {
     if (this.props.renderFooter) {
       return this.props.renderFooter(this);
diff --git a/src/renderer/components/item-object-list/table-menu.scss b/src/renderer/components/item-object-list/table-menu.scss
new file mode 100644
index 0000000000..b7e41f54ca
--- /dev/null
+++ b/src/renderer/components/item-object-list/table-menu.scss
@@ -0,0 +1,4 @@
+.MenuCheckbox {
+  width: 100%;
+  height: 100%;
+}
diff --git a/src/renderer/components/menu/menu-actions.tsx b/src/renderer/components/menu/menu-actions.tsx
index aa8191dd7f..4e46935aa4 100644
--- a/src/renderer/components/menu/menu-actions.tsx
+++ b/src/renderer/components/menu/menu-actions.tsx
@@ -13,6 +13,7 @@ import isString from "lodash/isString";
 export interface MenuActionsProps extends Partial<MenuProps> {
   className?: string;
   toolbar?: boolean; // display menu as toolbar with icons
+  autoCloseOnSelect?: boolean;
   triggerIcon?: string | IconProps | React.ReactNode;
   removeConfirmationMessage?: React.ReactNode | (() => React.ReactNode);
   updateAction?(): void;
@@ -80,7 +81,7 @@ export class MenuActions extends React.Component<MenuActionsProps> {
 
   render() {
     const {
-      className, toolbar, children, updateAction, removeAction, triggerIcon, removeConfirmationMessage,
+      className, toolbar, autoCloseOnSelect, children, updateAction, removeAction, triggerIcon, removeConfirmationMessage,
       ...menuProps
     } = this.props;
     const menuClassName = cssNames("MenuActions flex", className, {
@@ -98,7 +99,7 @@ export class MenuActions extends React.Component<MenuActionsProps> {
           className={menuClassName}
           usePortal={autoClose}
           closeOnScroll={autoClose}
-          closeOnClickItem={autoClose}
+          closeOnClickItem={autoCloseOnSelect ?? autoClose }
           closeOnClickOutside={autoClose}
           {...menuProps}
         >
diff --git a/src/renderer/components/table/table-cell.tsx b/src/renderer/components/table/table-cell.tsx
index a42db4c2be..97335078f1 100644
--- a/src/renderer/components/table/table-cell.tsx
+++ b/src/renderer/components/table/table-cell.tsx
@@ -15,6 +15,7 @@ export interface TableCellProps extends React.DOMAttributes<HTMLDivElement> {
   isChecked?: boolean; // mark checkbox as checked or not
   renderBoolean?: boolean; // show "true" or "false" for all of the children elements are "typeof boolean"
   sortBy?: TableSortBy; // column name, must be same as key in sortable object <Table sortable={}/>
+  showWithColumn?: string // className of another column, if it is not empty the current column is not shown in the filter menu, visibility of this one is the same as a specified column, applicable to headers only
   _sorting?: Partial<TableSortParams>; // <Table> sorting state, don't use this prop outside (!)
   _sort?(sortBy: TableSortBy): void; // <Table> sort function, don't use this prop outside (!)
   _nowrap?: boolean; // indicator, might come from parent <TableHead>, don't use this prop outside (!)
@@ -63,7 +64,7 @@ export class TableCell extends React.Component<TableCellProps> {
   }
 
   render() {
-    const { className, checkbox, isChecked, sortBy, _sort, _sorting, _nowrap, children, title, renderBoolean: displayBoolean, ...cellProps } = this.props;
+    const { className, checkbox, isChecked, sortBy, _sort, _sorting, _nowrap, children, title, renderBoolean: displayBoolean, showWithColumn, ...cellProps } = this.props;
     const classNames = cssNames("TableCell", className, {
       checkbox,
       nowrap: _nowrap,
diff --git a/src/renderer/utils/rbac.ts b/src/renderer/utils/rbac.ts
index 5f535c8109..36737ccf3a 100644
--- a/src/renderer/utils/rbac.ts
+++ b/src/renderer/utils/rbac.ts
@@ -25,4 +25,5 @@ export const ResourceNames: Record<KubeResource, string> = {
   "horizontalpodautoscalers": "Horizontal Pod Autoscalers",
   "podsecuritypolicies": "Pod Security Policies",
   "poddisruptionbudgets": "Pod Disruption Budgets",
+  "limitranges": "Limit Ranges",
 };
diff --git a/yarn.lock b/yarn.lock
index 97eae9dc25..4cfa01fdf4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -529,6 +529,13 @@
     "@hapi/pez" "^5.0.1"
     "@hapi/wreck" "17.x.x"
 
+"@hapi/topo@^5.0.0":
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/@hapi/topo/-/topo-5.0.0.tgz#c19af8577fa393a06e9c77b60995af959be721e7"
+  integrity sha512-tFJlT47db0kMqVm3H4nQYgn6Pwg10GTZHb1pwmSiv1K4ks6drQOtfEF5ZnPjkvC+y4/bUPHK+bc87QvLcL+WMw==
+  dependencies:
+    "@hapi/hoek" "^9.0.0"
+
 "@hapi/vise@4.x.x":
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/@hapi/vise/-/vise-4.0.0.tgz#c6a94fe121b94a53bf99e7489f7fcc74c104db02"
@@ -900,6 +907,23 @@
     schema-utils "^2.6.5"
     source-map "^0.7.3"
 
+"@sideway/address@^4.1.0":
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/@sideway/address/-/address-4.1.0.tgz#0b301ada10ac4e0e3fa525c90615e0b61a72b78d"
+  integrity sha512-wAH/JYRXeIFQRsxerIuLjgUu2Xszam+O5xKeatJ4oudShOOirfmsQ1D6LL54XOU2tizpCYku+s1wmU0SYdpoSA==
+  dependencies:
+    "@hapi/hoek" "^9.0.0"
+
+"@sideway/formula@^3.0.0":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@sideway/formula/-/formula-3.0.0.tgz#fe158aee32e6bd5de85044be615bc08478a0a13c"
+  integrity sha512-vHe7wZ4NOXVfkoRb8T5otiENVlT7a3IAiw7H5M2+GO+9CDgcVUUsX1zalAztCmwyOr2RUTGJdgB+ZvSVqmdHmg==
+
+"@sideway/pinpoint@^2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@sideway/pinpoint/-/pinpoint-2.0.0.tgz#cff8ffadc372ad29fd3f78277aeb29e632cc70df"
+  integrity sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ==
+
 "@sindresorhus/is@^0.14.0":
   version "0.14.0"
   resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.14.0.tgz#9fb3a3cf3132328151f353de4632e01e52102bea"
@@ -1175,19 +1199,19 @@
   dependencies:
     "@types/node" "*"
 
-"@types/hapi@^18.0.3":
-  version "18.0.3"
-  resolved "https://registry.yarnpkg.com/@types/hapi/-/hapi-18.0.3.tgz#e74c019f6a1b1c7f647fe014d3890adec9c0214a"
-  integrity sha512-UM03myDZ2UWbpqLSZqboK4L98F9r4GCcd9JOr2auhgC3iOd/69mvDggivOHhOYJKWHeCW/dECPHIB7DwQz00dw==
+"@types/hapi@^18.0.5":
+  version "18.0.5"
+  resolved "https://registry.yarnpkg.com/@types/hapi/-/hapi-18.0.5.tgz#7573fc83ec1d8ecf127b93bd326266da533fe30b"
+  integrity sha512-OnBslvAL//tsTZemW8wSGrVUj7BgtS16kBicgKCtEpHle9A3pOd7X4ViykKv/X3rh7g636mDzoqQ27+Ols5GQw==
   dependencies:
     "@types/boom" "*"
     "@types/catbox" "*"
     "@types/iron" "*"
-    "@types/joi" "*"
     "@types/mimos" "*"
     "@types/node" "*"
     "@types/podium" "*"
     "@types/shot" "*"
+    joi "^17.3.0"
 
 "@types/history@*", "@types/history@^4.7.3":
   version "4.7.6"
@@ -1299,11 +1323,6 @@
     jest-diff "^25.2.1"
     pretty-format "^25.2.1"
 
-"@types/joi@*":
-  version "14.3.4"
-  resolved "https://registry.yarnpkg.com/@types/joi/-/joi-14.3.4.tgz#eed1e14cbb07716079c814138831a520a725a1e0"
-  integrity sha512-1TQNDJvIKlgYXGNIABfgFp9y0FziDpuGrd799Q5RcnsDu+krD+eeW/0Fs5PHARvWWFelOhIG2OPCo6KbadBM4A==
-
 "@types/js-yaml@^3.12.1", "@types/js-yaml@^3.12.4":
   version "3.12.4"
   resolved "https://registry.yarnpkg.com/@types/js-yaml/-/js-yaml-3.12.4.tgz#7d3b534ec35a0585128e2d332db1403ebe057e25"
@@ -1406,12 +1425,7 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-10.17.24.tgz#c57511e3a19c4b5e9692bb2995c40a3a52167944"
   integrity sha512-5SCfvCxV74kzR3uWgTYiGxrd69TbT1I6+cMx1A5kEly/IVveJBimtAMlXiEyVFn5DvUFewQWxOOiJhlxeQwxgA==
 
-"@types/node@^12.0.12":
-  version "12.12.44"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.12.44.tgz#0d400a1453adcb359b133acceae4dd8bb0e0a159"
-  integrity sha512-jM6QVv0Sm5d3nW+nUD5jSzPcO6oPqboitSNcwgBay9hifVq/Rauq1PYnROnsmuw45JMBiTnsPAno0bKu2e2xrg==
-
-"@types/node@^12.12.45":
+"@types/node@^12.0.12", "@types/node@^12.12.45":
   version "12.12.45"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-12.12.45.tgz#33d550d6da243652004b00cbf4f15997456a38e3"
   integrity sha512-9w50wqeS0qQH9bo1iIRcQhDXRxoDzyAqCL5oJG+Nuu7cAoe6omGo+YDE0spAGK5sPrdLDhQLbQxq0DnxyndPKA==
@@ -6854,9 +6868,9 @@ inherits@2.0.3:
   integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
 
 ini@^1.3.4, ini@^1.3.5, ini@~1.3.0:
-  version "1.3.5"
-  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
-  integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==
+  version "1.3.8"
+  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c"
+  integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==
 
 init-package-json@^1.10.3:
   version "1.10.3"
@@ -7877,6 +7891,17 @@ jest@^26.0.1:
     import-local "^3.0.2"
     jest-cli "^26.0.1"
 
+joi@^17.3.0:
+  version "17.3.0"
+  resolved "https://registry.yarnpkg.com/joi/-/joi-17.3.0.tgz#f1be4a6ce29bc1716665819ac361dfa139fff5d2"
+  integrity sha512-Qh5gdU6niuYbUIUV5ejbsMiiFmBdw8Kcp8Buj2JntszCkCfxJ9Cz76OtHxOZMPXrt5810iDIXs+n1nNVoquHgg==
+  dependencies:
+    "@hapi/hoek" "^9.0.0"
+    "@hapi/topo" "^5.0.0"
+    "@sideway/address" "^4.1.0"
+    "@sideway/formula" "^3.0.0"
+    "@sideway/pinpoint" "^2.0.0"
+
 jose@^1.27.1:
   version "1.27.1"
   resolved "https://registry.yarnpkg.com/jose/-/jose-1.27.1.tgz#a1de2ecb5b3ae1ae28f0d9d0cc536349ada27ec8"
@@ -12116,10 +12141,10 @@ shebang-regex@^3.0.0:
   resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172"
   integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
 
-shell-env@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/shell-env/-/shell-env-3.0.0.tgz#42484ebd0798ee321ba69f6151f2aeab13fde1d4"
-  integrity sha512-zE0lGldowbCLnnorLnOUO6gLSwEoW4u+qWcEV1HH2qje5sIg0PvBd+8ro74EgSZv0MBEP2dROD6vSKhGDbUIMQ==
+shell-env@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/shell-env/-/shell-env-3.0.1.tgz#515a62f6cbd5e139365be2535745e8e53438ce77"
+  integrity sha512-b09fpMipAQ9ObwvIeKoQFLDXcEcCpYUUZanlad4OYQscw2I49C/u97OPQg9jWYo36bRDn62fbe07oWYqovIvKA==
   dependencies:
     default-shell "^1.0.1"
     execa "^1.0.0"