Tweaking padding/margin spacing.
Minor fixes.