Made an adjustment to the popover so that it times out better.

Added adjustments to a few more of the component sections.