Adaptive menu; other fixes; work still in progress