Done redesign TODO's