Fixed most of the menu problems