Move overlays to common