Fix Menu Fragment problems