Fixed focus problem, enabled transaction history storing.
Removed Unnecessary References