changes into templates and scss