Add grid filtering
Style update