Safe guards added to menus