Page cleanup, adding required fields