Vivo: Completely rework overlay