Adds Categories, improves managment views