Refine the dashboard, add client