added 4 categories, fixed edit bug