fix problem
fix  position popovetr
fix problem
divided into partial