Refactored options menu for sherpafy
Merge branch 'sherpafy'