[TASK] Adding some translations and cleaning up templates