fixing imports
fixing template errors