added; list logic and nav page