Various link/menu changes

In response to Paul's comments 1/21. Also set description2 on category
to text format.