Changed getTable call and added icons