Added overlay and popups