changed submit buttos by a elements in templates
conflicts resolved