Change admin display-row css so that multiple lines can fit in the control column. Don't hard-code a height on the rows.
Some topic list re-organization.
Merge remote-tracking branch 'upstream/master'