Issue 8 review2

Please remove this comment, also add menu item verification.