overflow ellipsis
New rule for cash payment
Minor layout update