Merged headers, updated lists page