added margin & todo