This fixes #8240.
This fixes #8239.  Some small changes to the css and one template.