Refactored a bit for all of the dashboard views, refs #9421