fix scroll behavior / change layout structure