flicking right bug fix
popup bug fix