Feature/assets table

TODO remove