minor restructuring of some gui files, more test work on template
transfer