Refactoring Transactions
Fixed merge, updated view functions