Menu Logic fix and Sun '+' work.