margin tweaks, final commits