Finish refactoring options menu