diff --git a/index.html b/index.html
index 2c4ace3..d855a4e 100644
--- a/index.html
+++ b/index.html
@@ -11,5 +11,6 @@
   <a href="/step1-09/">Step 9</a>
   <h2>Day 2</h2>
   <a href="/step2-01/">Step 1</a>
+  <a href="/step2-02/">Step 2</a>
   <a href="/playground/">Playground</a>
 </div>
diff --git a/step2-02/README.md b/step2-02/README.md
index e775930..430fbea 100644
--- a/step2-02/README.md
+++ b/step2-02/README.md
@@ -1,8 +1,9 @@
-# Step 2.1
+# Step 2.2
 
-Typescript
+Integrates Fabric
 
-- modules
-- a look at types
-- defining interfaces
--
+Learn about Basic Components
+
+- Stack
+- Text
+- Show case some components
diff --git a/step2-02/src/components/TodoHeader.tsx b/step2-02/src/components/TodoHeader.tsx
index 923d29b..fb6aef3 100644
--- a/step2-02/src/components/TodoHeader.tsx
+++ b/step2-02/src/components/TodoHeader.tsx
@@ -19,7 +19,30 @@ export class TodoHeader extends React.Component<TodoHeaderProps, TodoHeaderState
     this.state = { labelInput: undefined };
   }
 
-  private onAdd = (evt: React.MouseEvent<any>) => {
+  render() {
+    return (
+      <Stack>
+        <Stack horizontal horizontalAlign="center">
+          <Text variant="xxLarge">todos</Text>
+        </Stack>
+
+        <Stack horizontal>
+          <Stack.Item grow>
+            <TextField placeholder="What needs to be done?" value={this.state.labelInput} onChange={this.onChange} />
+          </Stack.Item>
+          <DefaultButton onClick={this.onAdd}>Add</DefaultButton>
+        </Stack>
+
+        <Pivot onLinkClick={this.onFilter}>
+          <PivotItem headerText="all" />
+          <PivotItem headerText="active" />
+          <PivotItem headerText="completed" />
+        </Pivot>
+      </Stack>
+    );
+  }
+
+  private onAdd = () => {
     this.props.addTodo(this.state.labelInput);
     this.setState({ labelInput: undefined });
   };
@@ -31,27 +54,4 @@ export class TodoHeader extends React.Component<TodoHeaderProps, TodoHeaderState
   private onFilter = (item: PivotItem) => {
     this.props.setFilter(item.props.headerText as FilterTypes);
   };
-
-  render() {
-    return (
-      <Stack>
-        <Stack horizontal horizontalAlign="center">
-          <Text variant="xxLarge">todos</Text>
-        </Stack>
-
-        <Stack as="form" horizontal>
-          <TextField placeholder="What needs to be done?" value={this.state.labelInput} onChange={this.onChange} />
-          <DefaultButton type="submit" onClick={this.onAdd}>
-            Add
-          </DefaultButton>
-        </Stack>
-
-        <Pivot onLinkClick={this.onFilter}>
-          <PivotItem headerText="all" />
-          <PivotItem headerText="active" />
-          <PivotItem headerText="completed" />
-        </Pivot>
-      </Stack>
-    );
-  }
 }
diff --git a/step2-02/src/components/TodoListItem.tsx b/step2-02/src/components/TodoListItem.tsx
index 42face0..e2d7909 100644
--- a/step2-02/src/components/TodoListItem.tsx
+++ b/step2-02/src/components/TodoListItem.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { Stack } from '@uifabric/experiments';
-import { Checkbox, IconButton, TextField } from 'office-ui-fabric-react';
+import { Checkbox, IconButton, TextField, DefaultButton } from 'office-ui-fabric-react';
 import { mergeStyles } from '@uifabric/styling';
 import { Store } from '../store';
 
@@ -37,34 +37,6 @@ export class TodoListItem extends React.Component<TodoListItemProps, TodoListIte
     this.state = { editing: false, editLabel: undefined };
   }
 
-  onEdit = () => {
-    const { todos, id } = this.props;
-    const { label } = todos[id];
-
-    this.setState(prevState => ({
-      editing: true,
-      editLabel: prevState.editLabel || label
-    }));
-  };
-
-  onDoneEdit = () => {
-    this.props.edit(this.props.id, this.state.editLabel);
-    this.setState(prevState => ({
-      editing: false,
-      editLabel: undefined
-    }));
-  };
-
-  onKeyDown = (evt: React.KeyboardEvent) => {
-    if (evt.which === 13) {
-      this.onDoneEdit();
-    }
-  };
-
-  onChange = (evt: React.FormEvent<HTMLInputElement>, newValue: string) => {
-    this.setState({ editLabel: newValue });
-  };
-
   render() {
     const { todos, id, complete, remove } = this.props;
     const item = todos[id];
@@ -81,8 +53,39 @@ export class TodoListItem extends React.Component<TodoListItemProps, TodoListIte
           </>
         )}
 
-        {this.state.editing && <TextField value={this.state.editLabel} onChange={this.onChange} onKeyPress={this.onKeyDown} />}
+        {this.state.editing && (
+          <Stack.Item fillHorizontal>
+            <Stack horizontal>
+              <Stack.Item grow>
+                <TextField value={this.state.editLabel} onChange={this.onChange} />
+              </Stack.Item>
+              <DefaultButton onClick={this.onDoneEdit}>Save</DefaultButton>
+            </Stack>
+          </Stack.Item>
+        )}
       </Stack>
     );
   }
+
+  private onEdit = () => {
+    const { todos, id } = this.props;
+    const { label } = todos[id];
+
+    this.setState({
+      editing: true,
+      editLabel: this.state.editLabel || label
+    });
+  };
+
+  private onDoneEdit = () => {
+    this.props.edit(this.props.id, this.state.editLabel);
+    this.setState({
+      editing: false,
+      editLabel: undefined
+    });
+  };
+
+  private onChange = (evt: React.FormEvent<HTMLInputElement>, newValue: string) => {
+    this.setState({ editLabel: newValue });
+  };
 }