Fixed refresh/adding item bug and other stuff