Many fixes, add Total/Remaining at the bottom of the list