diff --git a/.github/ISSUE_TEMPLATE/bug-report.md b/.github/ISSUE_TEMPLATE/bug-report.md
index e96336832f..7f174a3c2f 100644
--- a/.github/ISSUE_TEMPLATE/bug-report.md
+++ b/.github/ISSUE_TEMPLATE/bug-report.md
@@ -7,7 +7,7 @@ assignees: ''
 
 ---
 
-**Fleet version** (`fleetctl version`): 
+**Fleet version** (Head to the "My account" page in the Fleet UI or run `fleetctl version`): 
 **Operating system** _(e.g. macOS 11.2.3)_: 
 **Web browser** _(e.g. Chrome 88.0.4324)_: 
 <hr/>
@@ -23,5 +23,6 @@ assignees: ''
 ### More info
 <!-- Any ideas?  -->
 
+<!-- If this is an issue with the Fleet UI: Please also [answer this question](https://github.com/fleetdm/fleet/blob/master/CONTRIBUTING.md#6-is-this-an-issue-with-the-fleet-ui). -->
 
 <!-- If this is a performance issue: Please [follow these steps](https://github.com/fleetdm/fleet/blob/master/docs/1-Using-Fleet/5-Monitoring-Fleet.md#debugging-performance-issues) to generate and attach a debug archive. -->
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index cb93f39157..fe194fc8d6 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,13 +1,35 @@
 ## Filing issues
 
+### Bug report
+
 When filing an issue, make sure to answer these five questions:
 
-1. What version of Fleet are you using (`fleet version --full`)?
-2. What operating system are you using?
-3. What did you do?
-4. What did you expect to happen?
-5. What happened instead?
+#### 1. What version of Fleet are you using? 
+
+Copy the version from the "My account" page in the Fleet UI (located below the "Get API token" button) or by run the `fleetctl version --full` command.
+
+![My account page](./docs/images/my-account-page.png)
+
+#### 2. What operating system are you using?
+
+#### 3. What did you do?
+
+#### 4. What did you expect to happen?
+
+#### 5. What happened instead?
+
+#### 6. Is this an issue with the Fleet UI?
+
+If the answer is no, you can leave this blank.
+
+If yes, please provide a summary or screenshots of your browser's JavaScript console and your browser's network requests. Why? The information revealed in the browser's console and network requests kickstarts the debugging efforts and thus helps us resolve your issue faster!
+
+To open your browser's **Javascript console**, press Control Shift J (Windows, Linux, ChromeOS) or Command Option J (macOS).
+
+To open your browser's **network requests**, press Control Shift J (Windows, Linux, ChromeOS) or Command Option J (macOS). Then select the "Network" tab.
+
+
+### Report a security vulnerability
 
 Sensitive security-related issues should be reported to
 [security@fleetdm.com](mailto:security@fleetdm.com) before a public issue is made.
-
diff --git a/docs/3-Contribution/4-Commiting-Changes.md b/docs/3-Contribution/4-Committing-Changes.md
similarity index 100%
rename from docs/3-Contribution/4-Commiting-Changes.md
rename to docs/3-Contribution/4-Committing-Changes.md
diff --git a/docs/3-Contribution/README.md b/docs/3-Contribution/README.md
index d5bcc36b43..159d3045b4 100644
--- a/docs/3-Contribution/README.md
+++ b/docs/3-Contribution/README.md
@@ -9,7 +9,7 @@ Includes documentation about Fleet's full test suite and integration tests
 ### [Migrations](./3-Migrations.md)
 Information about creating and updating database migrations
 
-### [Commiting Changes](./4-Commiting-Changes.md) 
+### [Committing Changes](./4-Committing-Changes.md) 
 Contains information about how to merge changes into the codebase
 
 ### [Releasing Fleet](./5-Releasing-Fleet.md) 
diff --git a/docs/images/my-account-page.png b/docs/images/my-account-page.png
new file mode 100644
index 0000000000..7b344aec3f
Binary files /dev/null and b/docs/images/my-account-page.png differ