Refactoring list views
Performance improvements
Bug fixes