Fixed categories, added links to titles