changed categories.class
updated code several models/views