Rework of text and naming and adding some strick information like in the corresponding form for the templates site.