Add more stubbed UI
Resolve conflict