Options revamp - Merge Options/Stats Refactoring