Spacing and margin fixes