Add shortish entity label token and menu UI altering

Closes #3575558

Merge request reports

Loading