Add a lot of bug fixes and changes to app
Add starting chapter 3 design