[TASK] Refactor Menu