Refactor menu items to use a block