Fix Bug 820212. Update design and content to latest