Removing empty containers and adding classes for padding required