Delete buttons work, but two minor bugs to be fixed still