Fixed another rendering error.
Started moving data code to new structure.