Additional cleanup and add table wrap for overflow