efactor page screen to be more consistent with the others.