Fix merge conflicts
Fix touched state and move to stander onItemClick handling