major changes to layout and organization