Remove onClick, assign id's