Dashboard fix

@mnzaki review