updated the look and the structure of the templates