Adjusted some margin/padding units