A lot of template improvements and translation fixes