More Fixing of spacing