Moved overlay code in EventHandler to its own class Overlay