rename fixture
Updated models and fixture
core table-based rendering in place