localization and button text fix, way to test Ian :P
fixed templates