another padding, margin fixes