Lots more data, and layout fixes.