Mostly code re-org.  Removed Save Button Reminder text from Spies Pane (it added nothing).