Fixed several wrongs in width allocation