Fixes #19 #20 #26. 
But the amount is not shown in the table view