Better overlay behaviour