Revert translate logic + html in translate fix
Dashboard update