Fixed table overflow, added wrapper for histogram