Fixed menu. I did somethign else as well.
Fixed a merge error.