Menu fixes

And some word/align stuff,
Nothing major.