Remade both pages