Colour Multi-Filter

Added multi-filtering and different layouts for results vs. all