added: data handling on items
update: navigation and item handler
update: navigation and item handler
resolved merge conflict