fix correct before/after controls for report card and dashboard
Merge branch 'final-css'