Restructure order of scrolling to list and expanding items