New template + screenshot

and slight bugfix