More R4 UI work