Improve display of negative amounts. Closes #1658