Adjust layout
Better scroll behavior