prepared to use React + few minor fixes