Nearly completed chapter02, small changes regarding layout