Inconsistent user experience

Other TenderU issues: