List view and some refactoring.