refactor view a bit, get filters working, etc
fix stuff