updated template
- changed general structure
- fixes
- improvements