renamed Type to Category
changed several views