diff --git a/README.md b/README.md
index 33184db..18b0fa8 100644
--- a/README.md
+++ b/README.md
@@ -33,19 +33,8 @@ The navigator is auto-injected into your template, and no code changes are neede
 
 If your website uses caching, make sure BetterNavigator's output is excluded.
 
-## Custom navigator display logic
+### Access developer tools on a live website
 
-You can customise the navigator display logic using your own custom logic by defining a `showBetterNavigator(): bool`
-method in any controller with the extension applied. By default the navigator will only show on controllers that have a `dataRecord` property that is an instance of `SilverStripe\CMS\Model\SiteTree`.
-
-```php
-public function showBetterNavigator()
-{
-    // A user-defined setting
-    return $this->ShowDebugTools;
-}
-```
-**Access developer tools on a live website**
 You can mark certain CMS users as developers in your site's config, so they can access developer tools when logged in. Example YAML:
 
 ```
@@ -57,6 +46,21 @@ JonoM\BetterNavigator:
 
 ## Customisation
 
+### Navigator display
+
+You can control whether the navigator is displayed by defining a `showBetterNavigator(): bool`
+method in any controller with the extension applied. By default the navigator will only show on controllers that have a `dataRecord` property that is an instance of `SilverStripe\CMS\Model\SiteTree`.
+
+```php
+public function showBetterNavigator()
+{
+    // A user-defined setting
+    return $this->ShowDebugTools;
+}
+```
+
+### Layout options
+
 BetterNavigator can be made translucent when collapsed by adding the following config setting:
 
 ```
@@ -71,7 +75,9 @@ JonoM\BetterNavigator:
   position: 'right-bottom'
 ```
 
-BetterNavigator's output is controlled by templates so it can be [easily overridden](http://doc.silverstripe.org/framework/en/topics/theme-development#overriding).
+### Template additions/overrides
+
+BetterNavigator's output is controlled by templates so it can be [easily overridden](https://docs.silverstripe.org/en/5/developer_guides/templates/template_inheritance/#cascading-themes).
 
 Some empty `<% include %>` placeholders are included to let you easily add more content (new buttons for instance). Just create any of these templates in your theme or app directory and add your content:
 
@@ -81,7 +87,7 @@ Some empty `<% include %>` placeholders are included to let you easily add more
 
 The BetterNavigator.ss template's scope is set to the page that is being viewed, so any methods available in your page controller will be available in the BetterNavigator.ss template. This should allow you to add custom links by page type and introduce complex logic if you want to.
 
-## Overriding the "Edit in CMS" Link
+### Overriding the "Edit in CMS" Link
 
 There may be occasions when you wish to override the "Edit in CMS" link. For example to point to the edit form for a displayed DataObject, rather than for the Page itself. To do so, simply add a `BetterNavigatorEditLink()` method to your page's Controller, e.g.:
 
@@ -101,7 +107,7 @@ public function BetterNavigatorEditLink()
 
 (This example uses [sunnysideup/cms_edit_link_field](https://github.com/sunnysideup/silverstripe-cms_edit_link_field) to automatically find an edit link for a specified DataObject, but you can return any URL.)
 
-## Overriding the permissions required for the cms edit link
+### Overriding the permissions required for the cms edit link
 
 By default users are required to have at least the `CMS_ACCESS_CMSMain` permission in order to see the edit link in better navigator, you can override this by setting the `better_navigator_edit_permission` configuration option on your controller to another permission code or an array of permission codes, e.g.:
 
@@ -111,9 +117,15 @@ My\Namespace\EventController:
   better_navigator_edit_permission_mode: "any" #Optional, but can be either "any" or "all" (defaults to "all")
 ```
 
-## Bonus: better debugging tools
+## Recommended companions
 
-This module provide quick access to Silverstripe's built in [URL Variable Tools](http://doc.silverstripe.org/framework/en/reference/urlvariabletools) but reading their output isn't much fun. You can peek under Silverstripe's hood much more conveniently using lekoala's [Silverstripe DebugBar](https://github.com/lekoala/silverstripe-debugbar)
+### DebugBar for better debugging tools
+
+This module provide quick access to Silverstripe's built in [URL Variable Tools](https://docs.silverstripe.org/en/developer_guides/debugging/url_variable_tools/#url-variable-tools) but reading their output isn't much fun. You can peek under Silverstripe's hood much more conveniently using lekoala's [Silverstripe DebugBar](https://github.com/lekoala/silverstripe-debugbar)
+
+### Environment Awareness to save your sites from yourself
+
+[Environment Awareness](https://github.com/jonom/silverstripe-environment-awareness) makes it obvious which environment you're in, to make it less likely that you nuke something in prod. You can display the current environment [right in the navigator](https://github.com/jonom/silverstripe-environment-awareness/blob/master/docs/en/how-to-use.md#include-front-end-environment-notice).
 
 ## Maintainer contact