Made edit feature use controllers