Adding content to templates and fixing a little bit the layouts