CHanges to menu system
Fixed conflict