refactored code, added items and updated html