Fixed Padding Issue