diff --git a/TODO b/TODO
index b88996c..4a575b5 100644
--- a/TODO
+++ b/TODO
@@ -4,8 +4,6 @@ Todo
   - Maybe also use cxfreeze, py2exe, pyrun or zipapp?  Is zipapp the standard way?
   - Use cookiecutter?
   - Need to use conventional version numbers for pypi. See pep0440.
-- Only show the 'keys' in the help page, and only show the command line usage
-  on the command line.
 
 
 Todo (tool related)
@@ -164,6 +162,8 @@ Done
 - Determine if perl files are perl5 or perl6.
   <- At least done by perl_syntax.
 - Recognize python test files like: test_*.py
+- Only show the 'keys' in the help page, and only show the command line usage
+  on the command line.
 
 A-syntax, B-tests, C-auto docs, D-lint, E-coverage, F-profile, G-tidy, H-import deps
              A B C D E F G H
diff --git a/golden-files/help b/golden-files/help
index 3511638..c62ac1d 100644
--- a/golden-files/help
+++ b/golden-files/help
@@ -12,23 +12,6 @@
 │                                                                                                  │
 │The reports are cached in the codebase's root directory in a ".vigil" directory.                  │
 │                                                                                                  │
-│                                                                                                  │
-│Usage:                                                                                            │
-│  vigil [options] <directory>                                                                     │
-│  vigil -h | --help                                                                               │
-│                                                                                                  │
-│Example:                                                                                          │
-│  # vigil my_project                                                                              │
-│                                                                                                  │
-│Options:                                                                                          │
-│  -h, --help                       Show this screen and exit.                                     │
-│  -s on|off, --sandbox=on|off      Use a sandbox to prevent changes to the                        │
-│                                   filesystem. The sandbox is on by default.                      │
-│  -w COUNT, --workers=COUNT        The number of processes working in parallel.                   │
-│                                   By default it is twice the number of cpus.                     │
-│  -e "COMMAND", --editor="COMMAND" The command used to start the editor, in                       │
-│                                   the edit command. It may contain options.                      │
-│                                                                                                  │
 │Keys:                                                                                             │
 │  h - Show the help screen. (toggle)                                                              │
 │  q - Quit.                                                                                       │
@@ -57,4 +40,21 @@
 │                                                                                                  │
 │                                                                                                  │
 │                                                                                                  │
+│                                                                                                  │
+│                                                                                                  │
+│                                                                                                  │
+│                                                                                                  │
+│                                                                                                  │
+│                                                                                                  │
+│                                                                                                  │
+│                                                                                                  │
+│                                                                                                  │
+│                                                                                                  │
+│                                                                                                  │
+│                                                                                                  │
+│                                                                                                  │
+│                                                                                                  │
+│                                                                                                  │
+│                                                                                                  │
+│                                                                                                  │
 └──────────────────────────────────────────────────────────────────────────────────────────────────┘
\ No newline at end of file
diff --git a/vigil b/vigil
index 950db00..a9dd589 100755
--- a/vigil
+++ b/vigil
@@ -16,8 +16,10 @@ by selecting this status indicator with the cursor. The types of status are
 listed below.
 
 The reports are cached in the codebase's root directory in a ".vigil" directory.
+"""
 
 
+USAGE = """
 Usage:
   vigil [options] <directory>
   vigil -h | --help
@@ -33,8 +35,10 @@ Options:
                                    By default it is twice the number of cpus.
   -e "COMMAND", --editor="COMMAND" The command used to start the editor, in
                                    the *edit command. It may contain options.
+"""
 
-Keys:
+
+KEYS_DOC = """Keys:
   *h - Show the help screen. (toggle)
   *q - Quit.
   *d, *c, *j, *k, *f, *v or arrow keys or mouse click - Move the cursor.
@@ -474,12 +478,10 @@ def _highlight_chars(str_, style, marker="*"):
     return fill3.join("", [parts[0]] + highlighted_parts)
 
 
-def _get_help_text():
-    usage = _highlight_chars(__doc__, Log._GREEN_STYLE)
-    return fill3.join(
-        "\n", [usage, "Statuses:"] +
-        ["  " + tools.status_to_str(status) + " " + meaning
-         for status, meaning in tools.STATUS_MEANINGS])
+def _get_status_help():
+    return fill3.join("\n", ["Statuses:"] +
+                      ["  " + tools.status_to_str(status) + " " + meaning
+                       for status, meaning in tools.STATUS_MEANINGS])
 
 
 def _make_key_map(key_data):
@@ -495,7 +497,9 @@ class Help:
     def __init__(self, summary, screen):
         self.summary = summary
         self.screen = screen
-        self.view = fill3.View.from_widget(fill3.Text(_get_help_text()))
+        keys_doc = _highlight_chars(KEYS_DOC, Log._GREEN_STYLE)
+        help_text = fill3.join("\n", [__doc__, keys_doc, _get_status_help()])
+        self.view = fill3.View.from_widget(fill3.Text(help_text))
         self.widget = fill3.Border(self.view, title="Help")
         portal = self.view.portal
         self.key_map = _make_key_map([
@@ -997,9 +1001,11 @@ def _manage_cache(root_path):
 
 
 def _check_arguments():
-    arguments = docopt.docopt(__doc__.replace("*", ""), help=False)
+    cmdline_help = __doc__ + USAGE.replace("*", "")
+    arguments = docopt.docopt(cmdline_help, help=False)
     if arguments["--help"]:
-        print(_get_help_text())
+        print(cmdline_help)
+        print(_get_status_help())
         sys.exit(0)
     worker_count = None
     try: