Refactor and menu change