more ui cleanup and counterparty fixes
fixed claims