Changes to method of formatting data for UI. Bug fixes in HTML and Excel reports.