Fixed Menu Problem partially.