refactored transactions; small view adjustments