Fixed a layout problem with scrolling