More template improvements and translation updates.