fixed toggle and working on delete function