diff --git a/bonus-jest/demo/README.md b/bonus-jest/demo/README.md
index 3076b02..957f759 100644
--- a/bonus-jest/demo/README.md
+++ b/bonus-jest/demo/README.md
@@ -1,6 +1,6 @@
 # Bonus: Testing TypeScript code with Jest (Demo)
 
-[Lessons](../) | [Exercise](./exercise/) | [Demo](./demo/)
+[Lessons](../../) | [Exercise](../exercise/)
 
 [Jest](https://jestjs.io/) is a test framework made by Facebook and is very popular in the React and wider JS ecosystems.
 
diff --git a/bonus-jest/exercise/README.md b/bonus-jest/exercise/README.md
index 1860b51..514ca1d 100644
--- a/bonus-jest/exercise/README.md
+++ b/bonus-jest/exercise/README.md
@@ -1,6 +1,6 @@
 # Bonus: Testing TypeScript code with Jest (Exercise)
 
-[Lessons](../) | [Exercise](./exercise/) | [Demo](./demo/)
+[Lessons](../../) | [Demo](../demo/)
 
 Start the test runner by running `npm test` in the root of the `frontend-bootcamp` folder.
 
diff --git a/bonus-servicecalls/demo/README.md b/bonus-servicecalls/demo/README.md
index 3d1e21d..bb36297 100644
--- a/bonus-servicecalls/demo/README.md
+++ b/bonus-servicecalls/demo/README.md
@@ -1,6 +1,6 @@
 # Bonus: Service calls (Demo)
 
-[Lessons](../)
+[Lessons](../../)
 
 > Note: this step doesn't work with the live site on github.io. Clone the repo to try this step out.
 
diff --git a/markdownReadme/src/index.ts b/markdownReadme/src/index.ts
index 075c40f..eda520b 100644
--- a/markdownReadme/src/index.ts
+++ b/markdownReadme/src/index.ts
@@ -24,7 +24,7 @@ async function run() {
   if (div) {
     const response = await fetch(div.dataset['src'] || '../README.md');
     const markdownText = await response.text();
-    div.innerHTML = marked(markdownText, { baseUrl: '../' });
+    div.innerHTML = marked(markdownText);
     restoreScroll(div);
 
     div.addEventListener('scroll', evt => {
diff --git a/step2-01/demo/README.md b/step2-01/demo/README.md
index 73edc12..b2711df 100644
--- a/step2-01/demo/README.md
+++ b/step2-01/demo/README.md
@@ -1,6 +1,6 @@
 # Step 2.1: Introduction to TypeScript (Demo)
 
-[Lessons](../) | [Exercise](./exercise/) | [Demo](./demo/)
+[Lessons](../../) | [Exercise](../exercise/)
 
 In this step, we'll cover enough TypeScript concepts to be productive with the React & Redux frameworks.
 
diff --git a/step2-01/exercise/README.md b/step2-01/exercise/README.md
index 0106e15..5c76977 100644
--- a/step2-01/exercise/README.md
+++ b/step2-01/exercise/README.md
@@ -1,6 +1,6 @@
 # Step 2.1: Introduction to TypeScript (Exercise)
 
-[Lessons](../) | [Exercise](./exercise/) | [Demo](./demo/)
+[Lessons](../../) | [Demo](../demo/)
 
 If you don't already have the app running, start it by running `npm start` from the root of the `frontend-bootcamp` folder.
 
diff --git a/step2-02/demo/README.md b/step2-02/demo/README.md
index 7fe9578..24c42b4 100644
--- a/step2-02/demo/README.md
+++ b/step2-02/demo/README.md
@@ -1,6 +1,6 @@
 # Step 2.2: UI Fabric Component Library (Demo)
 
-[Lessons](../) | [Exercise](./exercise/) | [Demo](./demo/)
+[Lessons](../../) | [Exercise](../exercise/)
 
 [UI Fabric](https://developer.microsoft.com/en-us/fabric) is a component library that reflects the latest Microsoft design language. It is used in many Microsoft web applications and is [developed in the open](https://github.com/OfficeDev/office-ui-fabric-react).
 
diff --git a/step2-02/exercise/README.md b/step2-02/exercise/README.md
index 812df3c..d473833 100644
--- a/step2-02/exercise/README.md
+++ b/step2-02/exercise/README.md
@@ -1,6 +1,6 @@
 # Step 2.2: UI Fabric Component Library (Exercise)
 
-[Lessons](../) | [Exercise](./exercise/) | [Demo](./demo/)
+[Lessons](../../) | [Demo](../demo/)
 
 # Exercise 1: Getting familiar with the Fabric documentation site:
 
diff --git a/step2-03/demo/README.md b/step2-03/demo/README.md
index 4ff42ce..f36272d 100644
--- a/step2-03/demo/README.md
+++ b/step2-03/demo/README.md
@@ -1,6 +1,6 @@
 # Step 2.3: Theming and styling with UI Fabric (Demo)
 
-[Lessons](../) | [Exercise](./exercise/) | [Demo](./demo/)
+[Lessons](../../) | [Exercise](../exercise/)
 
 In this section, we will illustrate how to use some of the built-in theming and styling features of the UI Fabric component library.
 
diff --git a/step2-03/exercise/README.md b/step2-03/exercise/README.md
index 72c37bd..6eb7d5b 100644
--- a/step2-03/exercise/README.md
+++ b/step2-03/exercise/README.md
@@ -1,6 +1,6 @@
 # Step 2.3: Theming and styling with UI Fabric (Exercise)
 
-[Lessons](../) | [Exercise](./exercise/) | [Demo](./demo/)
+[Lessons](../../) | [Demo](../demo/)
 
 If you don't already have the app running, start it by running `npm start` from the root of the `frontend-bootcamp` folder. Click the "exercise" link under day 2 step 3 to see results.
 
diff --git a/step2-04/demo/README.md b/step2-04/demo/README.md
index 9d339b8..943fdd6 100644
--- a/step2-04/demo/README.md
+++ b/step2-04/demo/README.md
@@ -1,6 +1,6 @@
 # Step 2.4 - React Context (Demo)
 
-[Lessons](../) | [Exercise](./exercise/) | [Demo](./demo/)
+[Lessons](../../) | [Exercise](../exercise/)
 
 In this step, we describe some problems we encounter when creating a more complex application.
 
diff --git a/step2-04/exercise/README.md b/step2-04/exercise/README.md
index c96feaa..c80e502 100644
--- a/step2-04/exercise/README.md
+++ b/step2-04/exercise/README.md
@@ -1,6 +1,6 @@
 # Step 2.4 - React Context (Exercise)
 
-[Lessons](../) | [Exercise](./exercise/) | [Demo](./demo/)
+[Lessons](../../) | [Demo](../demo/)
 
 If you don't already have the app running, start it by running `npm start` from the root of the `frontend-bootcamp` folder. Click the "exercise" link under day 2 step 4 to see results.
 
diff --git a/step2-05/demo/README.md b/step2-05/demo/README.md
index bd03efc..2a1c5ac 100644
--- a/step2-05/demo/README.md
+++ b/step2-05/demo/README.md
@@ -1,6 +1,6 @@
 # Step 2.5 - Redux: The Store (Demo)
 
-[Lessons](../) | [Exercise](./exercise/) | [Demo](./demo/)
+[Lessons](../../) | [Exercise](../exercise/) | [Demo](../demo/)
 
 In this step, we will look at solving the problems of complex applications (as mentioned in Step 4) with a library called [Redux](https://redux.js.org).
 
diff --git a/step2-05/exercise/README.md b/step2-05/exercise/README.md
index 77db0e2..8588cb2 100644
--- a/step2-05/exercise/README.md
+++ b/step2-05/exercise/README.md
@@ -1,6 +1,6 @@
 # Step 2.5: Redux: Reducers (Exercise)
 
-[Lessons](../) | [Exercise](./exercise/) | [Demo](./demo/)
+[Lessons](../../) | [Demo](../demo/)
 
 If you don't already have the app running, start it by running `npm start` from the root of the `frontend-bootcamp` folder. Click the "exercise" link under day 2 step 5 to see results.
 
diff --git a/step2-06/demo/README.md b/step2-06/demo/README.md
index 9fd1811..7be7786 100644
--- a/step2-06/demo/README.md
+++ b/step2-06/demo/README.md
@@ -1,6 +1,6 @@
 # Step 2.6: Redux: React Binding (Demo)
 
-[Lessons](../) | [Exercise](./exercise/) | [Demo](./demo/)
+[Lessons](../../) | [Exercise](../exercise/)
 
 Redux is currently the most popular Flux implementation, and the ecosystem of related libraries has grown as a result. This is one of the reasons why it is a very popular library within Microsoft products.
 
diff --git a/step2-06/exercise/README.md b/step2-06/exercise/README.md
index 0cb2da9..4e83c1b 100644
--- a/step2-06/exercise/README.md
+++ b/step2-06/exercise/README.md
@@ -1,6 +1,6 @@
 # Step 2.6: Redux: React Binding (Exercise)
 
-[Lessons](../) | [Exercise](./exercise/) | [Demo](./demo/)
+[Lessons](../../) | [Demo](../demo/)
 
 If you haven't arStart the app by running `npm start` from the root of the `frontend-bootcamp` folder. Click the "exercise" link under day 2 step 6 to see results.
 
diff --git a/webpack.config.js b/webpack.config.js
index 2500139..17915fd 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -111,7 +111,7 @@ module.exports = function(env, argv) {
       extensions: ['.tsx', '.ts', '.js']
     },
     output: {
-      filename: '[name]/[name].js',
+      filename: '[name]/bundle.js',
       path: outPath
     },
     devServer: {