Grid pagination and filtering

Comments and small changes