More refactoring done with the build alert popup