Refactor adding items and deleting items. Restore click-to-focus functionality