small changes

moved header to template files
changed J