Template improvements

I can rebase all commits after review. (Could be useful to review single commits)