Template is done so far

Beside the changes for the subpages there are just a little changes to
be done