Feature/grid filtering

New UI for filtering