Edited class names and fixed categories block bug