Fix % width issues