Templates edited a little