Adding filter logic and style