Refractoring user view and apply pagination