Fix category, fix links