Merge pull request #1219 from Arantor/release-2.1

Minor things
Don't tether smc_PopupMenu to #top_info

Signed-off-by: John Rayes <live627@gmail.com>
Merge pull request #1220 from live627/smc_PopupMenu

Don't tether smc_PopupMenu to #top_info