Custom Dashboard multiple minor fixes