Edit templates and improve responsiveness