Fixed the delete function
refactored and made some partials!!!
updated