more html content and tidying