some changes to templates
some bugfixes and added register template
merge conflict 1
checkboxes