Structure improvements

Improvements to structure, including content elements.