Added icons to header and modified code for Tables