Fixed image name
Fixed category image names
Added simple filter
Merge conflict fix
Added view all-button