Refactor Menu service out of WindowOrder