FINAL COMMIT - includes a fix for the delete button