Final changes for a functional report view