Fix up demo frame tabbing issues.