trying to fix the padding issues :S