Added overlays + added disconnect flow