Adding search
Added pagination