Menu fixes. Various fixes.