Fixes Paik/Courier intent API integration

primarily fixes for Intent API use as well as UI updates