Updated templates and translations