cleaned up data, item click handling