Fixed padding issues