Updated to use react-tools