diff --git a/index.html b/index.html
index 8729d1b..ca70d61 100644
--- a/index.html
+++ b/index.html
@@ -69,28 +69,32 @@
           Setup, HTML, CSS, Javascript and Intro to React
         </li>
         <li class="Tile">
-          <a target="_blank" href="/step2-01/demo/" class="Tile-link">
+          <div class="Tile-link">
             Step 1<br />
             Typescript Basics
-          </a>
+            <div><a target="_blank" href="/step2-01/demo/">demo</a> | <a target="_blank" href="/step2-01/exercise/">exercise</a></div>
+          </div>
         </li>
         <li class="Tile">
-          <a target="_blank" href="/step2-02/demo/" class="Tile-link">
+          <div class="Tile-link">
             Step 2<br />
             UI Fabric
-          </a>
+            <div><a target="_blank" href="/step2-02/demo/">demo</a> | <a target="_blank" href="/step2-02/exercise/">exercise</a></div>
+          </div>
         </li>
         <li class="Tile">
-          <a target="_blank" href="/step2-03/demo/" class="Tile-link">
+          <div class="Tile-link">
             Step 3<br />
             UI Fabric: Theming and Styling
-          </a>
+            <div><a target="_blank" href="/step2-03/demo/">demo</a> | <a target="_blank" href="/step2-03/exercise/">exercise</a></div>
+          </div>
         </li>
         <li class="Tile">
-          <a target="_blank" href="/step2-04/" class="Tile-link">
+          <div class="Tile-link">
             Step 4<br />
             Testing with jest
-          </a>
+            <div><a target="_blank" href="/step2-04/demo/">demo</a> | <a target="_blank" href="/step2-04/exercise/">exercise</a></div>
+          </div>
         </li>
         <li class="Tile">
           <a target="_blank" href="/step2-05/" class="Tile-link">
diff --git a/step2-03/exercise/src/components/TodoApp.tsx b/step2-03/exercise/src/components/TodoApp.tsx
index 6699bbd..c7e0c35 100644
--- a/step2-03/exercise/src/components/TodoApp.tsx
+++ b/step2-03/exercise/src/components/TodoApp.tsx
@@ -6,7 +6,7 @@ import { TodoList } from './TodoList';
 import { Store } from '../store';
 
 // TODO: Change me to another theme!
-import { AzureCustomizationsLight } from '@uifabric/azure-themes';
+import { TeamsCustomizations } from '@uifabric/theme-samples';
 
 let index = 0;
 
@@ -26,7 +26,7 @@ export class TodoApp extends React.Component<any, Store> {
   render() {
     const { filter, todos } = this.state;
     return (
-      <Customizer {...AzureCustomizationsLight}>
+      <Customizer {...TeamsCustomizations}>
         <Stack horizontalAlign="center">
           <Stack style={{ width: 400 }} gap={25} className={className}>
             <TodoHeader addTodo={this._addTodo} setFilter={this._setFilter} filter={filter} />