reordering on load to include amount and percentage
Merge branch 'master' into testing