Clean up speaker and category pages

This tidies up the speaker and category pages so they're easier to
parse and use.