Added some missing faces for xact amounts.
Minor refactoring and code cleanup
Merge commit '6323fe52b7621c21f5e2af7fd9bce344a37a4ea1'