changed menu + removed warnings