changed menu setup