Changed the names of some of the categories and changed a few links