Further padding/margin amendments