Upgrade design. Also update some content.