Minor site improvements.
Updated for 2.3.21