Menu fixes. Should now work