Amendment template improvements.

you can rebase my template changes into your commit if you like
We decided, that all motions in our code should be referenced via motion.__unicode__, so that it is always the same. For this reason I would like not to use the identifier here.