Fixed issues with switching language; partial fix for activity indicator numbers