FIX: Remove double render firing and waiting to the end to insert all the items