Add more data. Minor layout adjustments.