Unifying Normal and Card code base

redesign the code so that normal and card list views share a common code base so changes to one will reflect in both. This will reduce bugs and keep the behavior consistent between them.