Cleaned up some stuff, added a delete button