Added pagination and custome list view
Cleaning