Updated LaTeX-template
Some (more) changes to the structure