Move overlay stuff to common