Working on switching to divs.
switch to lists in match indicator