minor tweaks to merging MainMenu and UserPref