Added category filter system
Better implementation of category filter