diff --git a/app/components/TodoItem.js b/app/components/TodoItem.js
index 6bd881cd..5116f4f0 100644
--- a/app/components/TodoItem.js
+++ b/app/components/TodoItem.js
@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import React from 'react';
+import PropTypes from 'prop-types';
 import { Text, Icon, ListItem, CheckBox } from 'native-base';
 
 const TodoItem = ({ toggle, remove, item }) => (
diff --git a/app/components/todo.js b/app/components/todo.js
index 58b7fdc6..f63969da 100644
--- a/app/components/todo.js
+++ b/app/components/todo.js
@@ -1,4 +1,5 @@
 import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 import { Container, Header, Title, Content, InputGroup, Input, List, Button, Icon } from 'native-base';
 import { View, Text, Dimensions } from 'react-native';
 
@@ -9,11 +10,11 @@ const { width } = Dimensions.get('window');
 export default class Todo extends Component {
 
   static propTypes = {
-    removeTodo: React.PropTypes.func,
-    setVisibilityFilter: React.PropTypes.func,
-    toggleTodo: React.PropTypes.func,
-    todos: React.PropTypes.array,
-    displayType: React.PropTypes.string,
+    removeTodo: PropTypes.func,
+    setVisibilityFilter: PropTypes.func,
+    toggleTodo: PropTypes.func,
+    todos: PropTypes.array,
+    displayType: PropTypes.string,
   }
 
   constructor(props) {
@@ -107,19 +108,25 @@ export default class Todo extends Component {
                 transparent
                 bordered={this.props.displayType === 'all'}
                 onPress={() => this.props.setVisibilityFilter('all')}
-              >All</Button>
+              >
+                <Text> All </Text>
+              </Button>
 
               <Button
                 transparent
                 bordered={this.props.displayType === 'completed'}
                 onPress={() => this.props.setVisibilityFilter('completed')}
-              >Completed</Button>
+              >
+                <Text> Completed </Text>
+              </Button>
 
               <Button
                 transparent
                 bordered={this.props.displayType === 'active'}
                 onPress={() => this.props.setVisibilityFilter('active')}
-              >Active</Button>
+              >
+                <Text> Active </Text>
+              </Button>
 
             </View>}
           </View>
@@ -148,7 +155,9 @@ export default class Todo extends Component {
           <Button
             style={{ flex: 0.1, marginLeft: 15 }}
             onPress={() => this.onSubmit()}
-          > Add </Button>
+          >
+            <Text> Add </Text>
+          </Button>
         </View>
       </Container>
     );
diff --git a/package-lock.json b/package-lock.json
new file mode 100644
index 00000000..571d65f4
--- /dev/null
+++ b/package-lock.json
@@ -0,0 +1,119 @@
+{
+  "name": "NativeBaseTodoApp",
+  "version": "1.0.0",
+  "lockfileVersion": 1,
+  "requires": true,
+  "dependencies": {
+    "asap": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz",
+      "integrity": "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY="
+    },
+    "core-js": {
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-1.2.7.tgz",
+      "integrity": "sha1-ZSKUwUZR2yj6k70tX/KYOk8IxjY="
+    },
+    "encoding": {
+      "version": "0.1.12",
+      "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.12.tgz",
+      "integrity": "sha1-U4tm8+5izRq1HsMjgp0flIDHS+s=",
+      "requires": {
+        "iconv-lite": "0.4.19"
+      }
+    },
+    "fbjs": {
+      "version": "0.8.16",
+      "resolved": "https://registry.npmjs.org/fbjs/-/fbjs-0.8.16.tgz",
+      "integrity": "sha1-XmdDL1UNxBtXK/VYR7ispk5TN9s=",
+      "requires": {
+        "core-js": "1.2.7",
+        "isomorphic-fetch": "2.2.1",
+        "loose-envify": "1.3.1",
+        "object-assign": "4.1.1",
+        "promise": "7.3.1",
+        "setimmediate": "1.0.5",
+        "ua-parser-js": "0.7.17"
+      }
+    },
+    "iconv-lite": {
+      "version": "0.4.19",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.19.tgz",
+      "integrity": "sha512-oTZqweIP51xaGPI4uPa56/Pri/480R+mo7SeU+YETByQNhDG55ycFyNLIgta9vXhILrxXDmF7ZGhqZIcuN0gJQ=="
+    },
+    "is-stream": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
+      "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ="
+    },
+    "isomorphic-fetch": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz",
+      "integrity": "sha1-YRrhrPFPXoH3KVB0coGf6XM1WKk=",
+      "requires": {
+        "node-fetch": "1.7.3",
+        "whatwg-fetch": "2.0.3"
+      }
+    },
+    "js-tokens": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
+      "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls="
+    },
+    "loose-envify": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.3.1.tgz",
+      "integrity": "sha1-0aitM/qc4OcT1l/dCsi3SNR4yEg=",
+      "requires": {
+        "js-tokens": "3.0.2"
+      }
+    },
+    "node-fetch": {
+      "version": "1.7.3",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-1.7.3.tgz",
+      "integrity": "sha512-NhZ4CsKx7cYm2vSrBAr2PvFOe6sWDf0UYLRqA6svUYg7+/TSfVAu49jYC4BvQ4Sms9SZgdqGBgroqfDhJdTyKQ==",
+      "requires": {
+        "encoding": "0.1.12",
+        "is-stream": "1.1.0"
+      }
+    },
+    "object-assign": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
+    },
+    "promise": {
+      "version": "7.3.1",
+      "resolved": "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz",
+      "integrity": "sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==",
+      "requires": {
+        "asap": "2.0.6"
+      }
+    },
+    "prop-types": {
+      "version": "15.6.0",
+      "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.6.0.tgz",
+      "integrity": "sha1-zq8IMCL8RrSjX2nhPvda7Q1jmFY=",
+      "requires": {
+        "fbjs": "0.8.16",
+        "loose-envify": "1.3.1",
+        "object-assign": "4.1.1"
+      }
+    },
+    "setimmediate": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
+      "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU="
+    },
+    "ua-parser-js": {
+      "version": "0.7.17",
+      "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.17.tgz",
+      "integrity": "sha512-uRdSdu1oA1rncCQL7sCj8vSyZkgtL7faaw9Tc9rZ3mGgraQ7+Pdx7w5mnOSF3gw9ZNG6oc+KXfkon3bKuROm0g=="
+    },
+    "whatwg-fetch": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-2.0.3.tgz",
+      "integrity": "sha1-nITsLc9oGH/wC8ZOEnS0QhduHIQ="
+    }
+  }
+}
diff --git a/package.json b/package.json
index b10fe786..c9cb1971 100644
--- a/package.json
+++ b/package.json
@@ -10,6 +10,7 @@
   "dependencies": {
     "moment": "^2.15.1",
     "native-base": "^0.5.15",
+    "prop-types": "^15.6.0",
     "react": "15.3.2",
     "react-native": "0.35.0",
     "react-redux": "^4.4.5",