Menu Fixes #2

-Much fix, very good