The overlay should be added after the centerpiece.
General code cleanup.