Finishing up chapter 1.
Fix toast message not showing bug.