diff --git a/samples/react-onedrive-finder/README.md b/samples/react-onedrive-finder/README.md
index bbcf3b648..8a43abde8 100644
--- a/samples/react-onedrive-finder/README.md
+++ b/samples/react-onedrive-finder/README.md
@@ -42,7 +42,7 @@ Below a draw resuming the custom query's made and what control uses to retrieve
 
 Solution|Author(s)
 --------|---------
-react-onedrive-finder | [André Lage](http://aaclage.blogspot.com) ([@aaclage](https://twitter.com/aaclage))
+react-onedrive-finder | [André Lage](https://github.com/aaclage) ([http://aaclage.blogspot.com](http://aaclage.blogspot.com), [@aaclage](https://twitter.com/aaclage))
 
 ## Version history
 
@@ -53,24 +53,20 @@ Version|Date|Comments
 1.1|April 24, 2021|Fixes, optimization, Styling and extension filter included
 1.0|April 16, 2021|Initial release
 
-## Disclaimer
-
-**THIS CODE IS PROVIDED *AS IS* WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING ANY IMPLIED WARRANTIES OF FITNESS FOR A PARTICULAR PURPOSE, MERCHANTABILITY, OR NON-INFRINGEMENT.**
-
----
-
 ## Minimal Path to Awesome
 
 - Clone this repository
 - Ensure that you are at the solution folder
 - in the command-line run:
-  - **npm install**
-  - **gulp serve**
-  - **gulp bundle --ship**
-  - **gulp package-solution --ship**
+  - `npm install`
+  - `gulp serve`
+  - `gulp bundle --ship`
+  - `gulp package-solution --ship`
   - Add to AppCatalog and deploy 
 
-## Grant the service principal permission to the Microsoft Graph API
+## Prerequisites
+
+### Grant the service principal permission to the Microsoft Graph API
 
 Once installed, the solution will request the required permissions via the **Office 365 admin portal > SharePoint > Advanced > API access**.
 If you prefer to approve the permissions in advance, for example when testing the solution in the Workbench page without installing it, you can do so using the [CLI for Microsoft 365](https://pnp.github.io/cli-microsoft365/):
@@ -96,5 +92,19 @@ This extension illustrates the following concepts:
 - **[FileList](https://docs.microsoft.com/en-us/graph/toolkit/components/file-list)** New mgt-file-list control.
 - **[File](https://docs.microsoft.com/en-us/graph/toolkit/components/file)** New mgt-file control.
 
+## Disclaimer
+
+**THIS CODE IS PROVIDED *AS IS* WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING ANY IMPLIED WARRANTIES OF FITNESS FOR A PARTICULAR PURPOSE, MERCHANTABILITY, OR NON-INFRINGEMENT.**
+
+## Support
+
+We do not support samples, but we do use GitHub to track issues and constantly want to improve these samples.
+
+If you encounter any issues while using this sample, [create a new issue](https://github.com/pnp/sp-dev-fx-webparts/issues/new?assignees=&labels=Needs%3A+Triage+%3Amag%3A%2Ctype%3Abug-suspected&template=bug-report.yml&sample=react-onedrive-finder&authors=@aaclage&title=react-onedrive-finder%20-%20).
+
+For questions regarding this sample, [create a new question](https://github.com/pnp/sp-dev-fx-webparts/issues/new?assignees=&labels=Needs%3A+Triage+%3Amag%3A%2Ctype%3Abug-suspected&template=question.yml&sample=react-onedrive-finder&authors=@aaclage&title=react-onedrive-finder%20-%20).
+
+Finally, if you have an idea for improvement, [make a suggestion](https://github.com/pnp/sp-dev-fx-webparts/issues/new?assignees=&labels=Needs%3A+Triage+%3Amag%3A%2Ctype%3Abug-suspected&template=suggestion.yml&sample=react-onedrive-finder&authors=@aaclage&title=react-onedrive-finder%20-%20).
+
 <img src="https://telemetry.sharepointpnp.com/sp-dev-fx-webparts/samples/react-onedrive-finder" />