split reset & settings
stick cancel at bottom
Merge pull request #2163 from edisonout/reset-reset-settings

Fix resetting settings/saves issues