CARE
CARE #10: Fixed dashboard implementation