Bug is fixed, merged both Grid and List view. there are some design issues