Restructure reports to make use of shared chart partial