Cleanup of groupings addition of container padding all around