fix: merge and styling adjustments continued (esp. dashboard-totalreport page)