transaction list now handle balance changes
fixing conflicts
beautification 1