Some refactoring due to the new FilterActivity interface. Landscape mode is almost done.