Fix up menu naming issues.
Fix up demo locations