After tidying up some urls again

Also spent an evening messing around with categories to see if I could do them quickly. I couldn't.

KISS