Move overlay to common