Refactor Menu specs