Some Fixes in Menu