change load order
Added pagination