Template improvements and translation strings