layout change to fix scrollbar bug