started refractoring pages