using ToxID instead of bare QString + proper alias using during widget creation
Merge branch 'pr774'