Big-layout bug fix with width.