Fix render and delete