transactions page update
merge from origin/master