fixed remove button stuff + .delete