Refactored config menu