Refactor menu filling code
Start replace with impl