Tweaks for images in figures, Main header margin fix