Finish demo app of chapter 2