Incorporated combined data environment

Reduced table column displayed count; added rounding of floating point
numbers in tables.  Added ETP data tables in UI and server.