Added event for data item selection
Moved modal display logic to router