Refactor FilterWidget and TransactionsFilterWidget