Tons of changes to the report view