Refactored area labels. Another attempt to fix area overlays.