remove hard code and fix some new item drag bugs