Fixed loading template
Fixed loading template and added files