Change button language, fixes to support modal