More padding/margin fixes