Fix for paragraph margin height and other small changes