Re-label disambiguation widget and close #7