Added some pages
Fixed conflicts after merge