Fixed the delete and cleaned ui a bit