Improvements in the templates and translations