Removed old HTML, refactored  ListItem to Item.