Add category column to topic form
Merge admin category form
Add category links