Content structure and style improvements