Refactor File menu