redesign templates and files