Working on client dashboard