Tidying up page objects to reflect changes