Change nested list implementation to sectioned list