Added pagination
Added search function