Fix padding/margin and P1