Fixed bug with width during layout