Canary merge

Improved partial tx screens.