Move the rest of the buttons into lists.