Fixed templates
Fixed templates
File clean up