CLC-1464 Restore Role widget picker to Link model
CLC-1464 Consolidated category tables into one