redid grid with filter
grid almost fixed
update grid
Merge pull request #56 from RKim220/filter

Filter
fix merge conflicts