menu fixes merged from adbee