Refactored delete functionality to be more Object-Oriented and improved overall UI