refactore pages classes (suite)