Refactor and red change menu