Switching to React for most rendering