data structure tweaks, seed data, page layout
merged