Adding default Categories and fixing links