Update for React changes

Plus basic body selection
Signed-off-by: Aleksi Sapon <QcTechs@gmail.com>