Refactor close button handling
Render list items with checkboxes