refactoring of data tables display (final for now)