Fixed issues after implementing translation on label