Updated code changes for dashboard

Updated code changes for dashboard