Made TransactionPage class more robust