Fix padding issues
Fix display name for containers