a few bug fixes with menu