Add React and cleanup template
Merge comflicts