menu fix, admin removal fix