nsayer's GFI_SELFTEST and menu cleanup