Lesson 6 reorganised the html structure
Fix some small bugs and add lesson7 currently not working correctly