added menu fixes