Refactored Views lists