Many updates made to both UI and content.

Many updates made to both UI and content.