[R2D] Fixed margin & padding issues