Minor refactor to make list item class also data driven.