menu fixes more...