Restructure to fix NYT
Fix screwup with ul and tidy