changed structure added menu