diff --git a/challenger/src/main/java/uk/co/compendiumdev/challenge/gui/ChallengerWebGUI.java b/challenger/src/main/java/uk/co/compendiumdev/challenge/gui/ChallengerWebGUI.java
index cbfa793f..cd1eea8e 100644
--- a/challenger/src/main/java/uk/co/compendiumdev/challenge/gui/ChallengerWebGUI.java
+++ b/challenger/src/main/java/uk/co/compendiumdev/challenge/gui/ChallengerWebGUI.java
@@ -247,7 +247,13 @@ public void setup(final Challengers challengers,
                 // all html content that is parsed will be in content folder in resources so we don't need to add that in the url
                 String contentFolder = "content";
                 ClassLoader classLoader = getClass().getClassLoader();
-                InputStream inputStream = classLoader.getResourceAsStream(contentFolder + request.pathInfo() + ".md");
+
+                String contentPath = request.pathInfo();
+                if(contentPath.endsWith(".html")){
+                    contentPath = contentPath.replace(".html", "");
+                }
+
+                InputStream inputStream = classLoader.getResourceAsStream(contentFolder + contentPath + ".md");
                 if(inputStream==null) {
                     pageNotFoundHtmlResponse(response, "");
                 }else{
diff --git a/challenger/src/main/resources/content/learning.md b/challenger/src/main/resources/content/learning.md
new file mode 100644
index 00000000..5e25498a
--- /dev/null
+++ b/challenger/src/main/resources/content/learning.md
@@ -0,0 +1,41 @@
++++
+title = Learning Utilities and Resources
++++
+
+# Learning
+
+## Mirror Mode
+
+The Mirror mode is a good way to test out your tooling and see the details of your requests without using a proxy.
+
+[Access the Mirror Mode Here](/mirror.html)
+
+## Simulation Mode
+
+The API has a simulation mode, it uses hard coded data in responses, but tries to mimic some conditions.
+
+e.g. it expects you to post a specific JSON payload or XML payload and responds 'as if' you sent it. But... it also checks if you sent valid json, or valid xml, and responds based on your headers e.g. returning XML if you ask for it.
+
+The simulator is stateless and does not track your usage, making it deterministic for multiple users.
+
+The simulator is a good place to get started because it will respond nicely... unless you mess up the request syntax.
+
+[Access the Simulator Here](/simulation.html)
+
+## Automating and Testing a REST API Book
+
+Alan Richardson wrote a book [Automating and Testing a REST API](https://www.eviltester.com/page/books/automating-testing-api-casestudy/)
+
+Buying the book helps support this web site and application.
+
+## Challenge Tutorials
+
+All of the Challenges have solution tutorials that are available on the [EvilTester.com](https://eviltester.com) blog.
+
+[Read the API Challenges Posts](https://www.eviltester.com/categories/api-challenges/)
+
+## Open Source Workshops
+
+All the material from Alan Richardson's REST API Training workshops have been released to Github.
+
+[Find the Workshop Material Here](https://www.eviltester.com/post/rest-api-workshops/)
\ No newline at end of file
diff --git a/challenger/src/main/resources/content/sponsors.md b/challenger/src/main/resources/content/sponsors.md
new file mode 100644
index 00000000..cea3e6f3
--- /dev/null
+++ b/challenger/src/main/resources/content/sponsors.md
@@ -0,0 +1,38 @@
++++
+title = Sponsors of API Challenges
++++
+
+# Support and Sponsorship
+
+This application is made available free to the public thanks to the generosity of our sponsors and supporters.
+
+Their support helps:
+
+- pay for hosting
+- support ongoing development
+- support creation of associated free training material
+
+## Current Platinum sponsor
+
+[![](https://www.eviltester.com/siteimages/evil_laugh_cleaned_transparent_h300.png)](https://eviltester.com)
+
+- [EvilTester.com](https://eviltester.com) free online training and books related to Software Testing and Development. Also including The Evil Tester Show podcast, and YouTube video channel.
+
+## Gold Sponsors
+
+[![Bespoke Software Development Consultancy and Training](https://compendiumdev.co.uk/images/cut_down_logo_152_171_e.png)](https://compendiumdev.co.uk)
+
+[Want to become a corporate sponsor of API Challenges?](https://eviltester.com/page/sponsor/corporate/)
+
+## Patreon
+
+Thank you to everyone who helps supports this project by being a part of our Patreon programme:
+
+- [Patreon](https://patreon.com/eviltester)
+
+## Historic Sponsors
+
+Thank you to all previous sponsors:
+
+- [EvilTester.com](https://eviltester.com)
+- [Compendium Developments](https://compendiumdev.co.uk)
diff --git a/challenger/src/main/resources/public/learning.html b/challenger/src/main/resources/public/learning.html
deleted file mode 100644
index 98c818b2..00000000
--- a/challenger/src/main/resources/public/learning.html
+++ /dev/null
@@ -1,85 +0,0 @@
-<html>
-<head>
-    <meta http-equiv='content-language' content='en-us'>
-    <title>Learning Utilities and Resources</title>
-    <link rel='stylesheet' href='/css/default.css'>
-    <script defer data-domain="apichallenges.eviltester.com" src="https://plausible.io/js/script.js"></script>
-</head>
-<body>
-<div class='content'>
-
-    <div class='rootmenu menu'><ul><li><a href='/'>Home</a></li><li><a href='/gui/entities'>Entities Explorer</a></li><li><a href='/gui/challenges'>Challenges</a></li><li><a href='/learning.html'>Learning</a></li><li><a href='/docs'>API documentation</a></li></ul></div>
-
-<!--
-
-# Learning
-
-## Mirror Mode
-
-The Mirror mode is a good way to test out your tooling and see the details of your requests without using a proxy.
-
-[Access the Mirror Mode Here](/mirror.html)
-
-## Simulation Mode
-
-The API has a simulation mode, it uses hard coded data in responses, but tries to mimic some conditions.
-
-e.g. it expects you to post a specific JSON payload or XML payload and responds 'as if' you sent it. But... it also checks if you sent valid json, or valid xml, and responds based on your headers e.g. returning XML if you ask for it.
-
-The simulator is stateless and does not track your usage, making it deterministic for multiple users.
-
-The simulator is a good place to get started because it will respond nicely... unless you mess up the request syntax.
-
-[Access the Simulator Here](/simulation.html)
-
-## Automating and Testing a REST API Book
-
-Alan Richardson wrote a book [Automating and Testing a REST API](https://www.eviltester.com/page/books/automating-testing-api-casestudy/)
-
-Buying the book helps support this web site and application.
-
-## Challenge Tutorials
-
-All of the Challenges have solution tutorials that are available on the [EvilTester.com](https://eviltester.com) blog.
-
-[Read the API Challenges Posts](https://www.eviltester.com/categories/api-challenges/)
-
-## Open Source Workshops
-
-All the material from Alan Richardson's REST API Training workshops have been released to Github.
-
-[Find the Workshop Material Here](https://www.eviltester.com/post/rest-api-workshops/)
-
--->
-
-    <h1 id="learning">Learning</h1>
-    <h2 id="mirror-mode">Mirror Mode</h2>
-    <p>The Mirror mode is a good way to test out your tooling and see the details of your requests without using a proxy.</p>
-    <p><a href="/mirror.html">Access the Mirror Mode Here</a></p>
-    <h2 id="simulation-mode">Simulation Mode</h2>
-    <p>The API has a simulation mode, it uses hard coded data in responses, but tries to mimic some conditions.</p>
-    <p>e.g. it expects you to post a specific JSON payload or XML payload and responds &#39;as if&#39; you sent it. But... it also checks if you sent valid json, or valid xml, and responds based on your headers e.g. returning XML if you ask for it.</p>
-    <p>The simulator is stateless and does not track your usage, making it deterministic for multiple users.</p>
-    <p>The simulator is a good place to get started because it will respond nicely... unless you mess up the request syntax.</p>
-    <p><a href="/simulation.html">Access the Simulator Here</a></p>
-    <h2 id="automating-and-testing-a-rest-api-book">Automating and Testing a REST API Book</h2>
-    <p>Alan Richardson wrote a book <a href="https://www.eviltester.com/page/books/automating-testing-api-casestudy/">Automating and Testing a REST API</a></p>
-    <p>Buying the book helps support this web site and application.</p>
-    <h2 id="challenge-tutorials">Challenge Tutorials</h2>
-    <p>All of the Challenges have solution tutorials that are available on the <a href="https://eviltester.com">EvilTester.com</a> blog.</p>
-    <p><a href="https://www.eviltester.com/categories/api-challenges/">Read the API Challenges Posts</a></p>
-    <h2 id="open-source-workshops">Open Source Workshops</h2>
-    <p>All the material from Alan Richardson&#39;s REST API Training workshops have been released to Github.</p>
-    <p><a href="https://www.eviltester.com/post/rest-api-workshops/">Find the Workshop Material Here</a></p>
-
-
-
-
-    <p>&nbsp;</p><hr/><div class='footer'><p>Copyright Compendium Developments Ltd 2020 </p>
-    <ul class='footerlinks'><li><a href='https://eviltester.com/apichallenges'>API Challenges Info</a></li>
-        <li><a href='https://eviltester.com'>EvilTester.com</a></li>
-    </ul></div>
-
-</div>
-</body>
-</html>
diff --git a/challenger/src/main/resources/public/sponsors.html b/challenger/src/main/resources/public/sponsors.html
deleted file mode 100644
index 354548dd..00000000
--- a/challenger/src/main/resources/public/sponsors.html
+++ /dev/null
@@ -1,112 +0,0 @@
-<html>
-<head>
-    <meta http-equiv='content-language' content='en-us'>
-
-    <title>The API Challenges</title>
-
-    <link rel='stylesheet' href='/css/default.css'>
-    <script defer data-domain="apichallenges.eviltester.com" src="https://plausible.io/js/script.js"></script>
-</head>
-<body>
-
-<div class='content'>
-
-    <div class='rootmenu menu'><ul><li><a href='/'>Home</a></li><li><a href='/gui/entities'>Entities Explorer</a></li><li><a href='/gui/challenges'>Challenges</a></li><li><a href='/learning.html'>Learning</a></li><li><a href='/docs'>API documentation</a></li></ul></div>
-
-    <!--
-
-# Support and Sponsorship
-
-This application is made available free to the public thanks to the generosity of our sponsors and supporters.
-
-Their support helps:
-
-- pay for hosting
-- support ongoing development
-- support creation of associated free training material
-
-## Current Platinum sponsor
-
-[![](https://www.eviltester.com/siteimages/evil_laugh_cleaned_transparent_h300.png)](https://eviltester.com)
-
-- [EvilTester.com](https://eviltester.com) free online training and books related to Software Testing and Development. Also including The Evil Tester Show podcast, and YouTube video channel.
-
-## Gold Sponsors
-
-[![Bespoke Software Development Consultancy and Training](https://compendiumdev.co.uk/images/cut_down_logo_152_171_e.png)](https://compendiumdev.co.uk)
-
-[Want to become a corporate sponsor of API Challenges?](https://eviltester.com/page/sponsor/corporate/)
-
-## Patreon
-
-Thank you to everyone who helps supports this project by being a part of our Patreon programme:
-
-- [Patreon](https://patreon.com/eviltester)
-
-## Historic Sponsors
-
-Thank you to all previous sponsors:
-
-- [EvilTester.com](https://eviltester.com)
-- [Compendium Developments](https://compendiumdev.co.uk)
-
-
--->
-
-
-
-
-
-
-    <h1 id="support-and-sponsorship">Support and Sponsorship</h1>
-    <p>This application is made available free to the public thanks to the generosity of our sponsors and supporters.</p>
-    <p>Their support helps:</p>
-    <ul>
-        <li>pay for hosting</li>
-        <li>support ongoing development</li>
-        <li>support creation of associated free training material</li>
-    </ul>
-    <h2 id="current-platinum-sponsor">Current Platinum sponsor</h2>
-    <p><a href="https://eviltester.com"><img src="https://www.eviltester.com/siteimages/evil_laugh_cleaned_transparent_h300.png" alt=""></a></p>
-    <ul>
-        <li><a href="https://eviltester.com">EvilTester.com</a> free online training and books related to Software Testing and Development. Also including The Evil Tester Show podcast, and YouTube video channel.</li>
-    </ul>
-    <h2 id="gold-sponsors">Gold Sponsors</h2>
-    <p><a href="https://compendiumdev.co.uk"><img src="https://compendiumdev.co.uk/images/cut_down_logo_152_171_e.png" alt="Bespoke Software Development Consultancy and Training"></a></p>
-    <p><a href="https://eviltester.com/page/sponsor/corporate/">Want to become a corporate sponsor of API Challenges?</a></p>
-    <h2 id="patreon">Patreon</h2>
-    <p>Thank you to everyone who helps supports this project by being a part of our Patreon programme:</p>
-    <ul>
-        <li><a href="https://patreon.com/eviltester">Patreon</a></li>
-    </ul>
-    <h2 id="historic-sponsors">Historic Sponsors</h2>
-    <p>Thank you to all previous sponsors:</p>
-    <ul>
-        <li><a href="https://eviltester.com">EvilTester.com</a></li>
-        <li><a href="https://compendiumdev.co.uk">Compendium Developments</a></li>
-    </ul>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-    <p>&nbsp;</p><hr/><div class='footer'><p>Copyright Compendium Developments Ltd 2020 </p>
-    <ul class='footerlinks'><li><a href='https://eviltester.com/apichallenges'>API Challenges Info</a></li>
-        <li><a href='https://eviltester.com'>EvilTester.com</a></li>
-    </ul></div>
-
-</div>
-</body>
-</html>