Cleaned up CBHDashboard a little.