MainMenu reformat

MainMenu reformatted to make use of an activeSurvey_ *and* an
activeTest_.