mid point checkin on a minor refacor for some page changes