Fixing width issues