cleaning up field label issues on pages and masks