Update templates

- Fix empty lines
- Add some more text