Restructuring override so fileprep screen isn't so crowded