* work

* fixes

* updates

* update table layout

* revert changes

* notes

* updae names and improve flow

* work

* notes

* error fixes

* updates

* card fix

* fix filters

* splitting PR work

* notes