Fixed several poorly placed pads