Some changes for dashboard