Added category image, minor refactoring