Replaced ViewHolder by a generic approach that is backed by a sparse array, dependency fixes