some content enhancement and layout changes