Converted all Overlays to own Views