Admin - Improve to generate the display table contains all

Credit