Add image alingment and other small fixes