Modified Components list to be a table