Merge "Transactions view improvements"