More work on the content area and other smaller things