Refactoring Transactions
Merge commit 'origin/development' into development
Fixed merge, updated view functions