Follow up on content structure review

See #41 

It would also be good to make sure that the content structure reflects the designs as much as possible.