Change the templates to the final desing

Put all the commentaries in the pages