Add minimal UI
Add popup handler