More UI integration from Shadow's code