Better container padding. Fixes #402